diff --git a/apps/agent-services/agent-registry/src/app.py b/apps/agent-services/agent-registry/src/app.py
index 1bbe8fdc..96f00a86 100644
--- a/apps/agent-services/agent-registry/src/app.py
+++ b/apps/agent-services/agent-registry/src/app.py
@@ -142,4 +142,4 @@ async def health_check():
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8003)
+    uvicorn.run(app, host="0.0.0.0", port=8012)
diff --git a/setup.sh b/setup.sh
index 447cd1a8..cc4c3789 100755
--- a/setup.sh
+++ b/setup.sh
@@ -231,8 +231,6 @@ check_service "Exchange API" "http://localhost:8001/api/health"
 check_service "Wallet API" "http://localhost:8003/health"
 check_service "Modality Optimization" "http://localhost:8004/health"
 check_service "Explorer" "http://localhost:8005/health"
-check_service "Agent Registry" "http://localhost:8008/health"
-check_service "AI Service" "http://localhost:8009/health"
 
 # AI/Agent/GPU Services (8010-8019)
 echo ""
@@ -240,6 +238,8 @@ echo "🚀 AI/Agent/GPU Services (8010-8019):"
 check_service "GPU Service" "http://localhost:8010/health"
 check_service "Learning Service" "http://localhost:8010/health"
 check_service "Agent Coordinator" "http://localhost:8011/health"
+check_service "Agent Registry" "http://localhost:8012/health"
+check_service "AI Service" "http://localhost:8009/health"
 check_service "Web UI" "http://localhost:8016/health"
 
 # Other Services (8020-8029)