diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index b591a05..29d10da 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -29,6 +29,7 @@ jobs:
     DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
     IMAGE_NAME: ${{ github.event.repository.name }}
     IMAGE_TAG: latest
+    APP_PORT: 5000
   
   steps:
     - name: Checkout code
@@ -39,29 +40,79 @@ jobs:
         echo "📥 Installing Ghaymah CLI..."
         curl -sSL https://cli.ghaymah.systems/install.sh | bash
         echo "✅ Ghaymah CLI installed"
+        
+        # Verify installation
+        $HOME/ghaymah/bin/gy --version
     
     - name: Login to Ghaymah
       run: |
         echo "🔐 Authenticating with Ghaymah..."
         $HOME/ghaymah/bin/gy auth login --email "${{ secrets.GHAYMAH_EMAIL }}" --password "${{ secrets.GHAYMAH_PASSWORD }}"
         echo "✅ Successfully logged in to Ghaymah"
-    
-    - name: Setup Ghaymah deployment
-      run: |
-        echo "☁️ Setting up Ghaymah deployment..."
         
-        # Create project
-        echo "🔧 Creating project: $PROJECT_NAME"
-        PROJECT_ID=$($HOME/ghaymah/bin/gy resource project create --set .name="$PROJECT_NAME" | awk '/ID:/ {print $NF}')
+        # Verify authentication
+        $HOME/ghaymah/bin/gy auth status
+    
+    - name: Debug - List existing projects
+      run: |
+        echo "🔍 Checking existing projects..."
+        $HOME/ghaymah/bin/gy resource project list || echo "No projects found or command failed"
+    
+    - name: Create or get project
+      id: project
+      run: |
+        echo "🏗️ Setting up project: $PROJECT_NAME"
+        
+        # Try to get existing project first
+        echo "🔍 Looking for existing project..."
+        EXISTING_PROJECT=$($HOME/ghaymah/bin/gy resource project get --name "$PROJECT_NAME" 2>/dev/null | grep -oP 'ID:\s*\K[^\s]+' || echo "")
+        
+        if [ -n "$EXISTING_PROJECT" ]; then
+          echo "✅ Using existing project: $PROJECT_NAME"
+          PROJECT_ID="$EXISTING_PROJECT"
+        else
+          echo "📝 Creating new project: $PROJECT_NAME"
+          CREATE_OUTPUT=$($HOME/ghaymah/bin/gy resource project create --set .name="$PROJECT_NAME")
+          echo "Create output: $CREATE_OUTPUT"
+          
+          # Extract project ID using multiple methods
+          PROJECT_ID=$(echo "$CREATE_OUTPUT" | grep -oP 'ID:\s*\K[^\s]+')
+          
+          # Alternative extraction method
+          if [ -z "$PROJECT_ID" ]; then
+            PROJECT_ID=$(echo "$CREATE_OUTPUT" | awk '/ID:/ {print $NF}')
+          fi
+        fi
         
         if [ -z "$PROJECT_ID" ]; then
           echo "❌ Failed to get project ID"
+          echo "Debug info:"
+          echo "PROJECT_NAME: $PROJECT_NAME"
+          echo "CREATE_OUTPUT: $CREATE_OUTPUT"
           exit 1
         fi
         
-        echo "✅ Project ID: ${PROJECT_ID}"
+        # Validate project ID format (should not be the default/null ID)
+        if [ "$PROJECT_ID" = "00000000-0000-0000-0000-000000000000" ]; then
+          echo "❌ Invalid project ID received: $PROJECT_ID"
+          exit 1
+        fi
+        
+        echo "✅ Project ID: $PROJECT_ID"
+        echo "PROJECT_ID=$PROJECT_ID" >> $GITHUB_OUTPUT
+    
+    - name: Create Ghaymah configuration
+      run: |
+        echo "⚙️ Creating deployment configuration..."
+        
+        PROJECT_ID="${{ steps.project.outputs.PROJECT_ID }}"
+        
+        # Verify we have a valid project ID
+        if [ -z "$PROJECT_ID" ] || [ "$PROJECT_ID" = "00000000-0000-0000-0000-000000000000" ]; then
+          echo "❌ Invalid project ID, cannot create configuration"
+          exit 1
+        fi
         
-        # Create .ghaymah.json configuration
         cat > .ghaymah.json << EOF
 {
     "container": {
@@ -72,7 +123,7 @@ jobs:
     "ports": [
         {
             "expose": true,
-            "number": 5000
+            "number": ${APP_PORT}
         }
     ],
     "projectId": "${PROJECT_ID}",
@@ -85,21 +136,65 @@ jobs:
 }
 EOF
         
-        echo "✅ Configuration file created:"
-        echo "   - Project: ${PROJECT_NAME} (ID: ${PROJECT_ID})"
-        echo "   - App: ${APP_NAME}"
-        echo "   - Image: ${DOCKER_USERNAME}/${IMAGE_NAME}:${IMAGE_TAG}"
+        echo "✅ Configuration file created"
+        echo "📋 Configuration details:"
+        echo "   Project: $PROJECT_NAME (ID: $PROJECT_ID)"
+        echo "   App: $APP_NAME"
+        echo "   Image: $DOCKER_USERNAME/$IMAGE_NAME:$IMAGE_TAG"
+        echo "   Port: $APP_PORT"
+        
+        # Verify the file was created correctly
+        echo "🔍 Verifying configuration file:"
+        cat .ghaymah.json
+        echo ""
+        
+        # Check if project ID in file matches
+        CONFIG_PROJECT_ID=$(cat .ghaymah.json | jq -r '.projectId' 2>/dev/null || echo "jq not available")
+        echo "Project ID in config: $CONFIG_PROJECT_ID"
+    
+    - name: Initialize app (optional but recommended)
+      run: |
+        echo "🔧 Initializing app in project..."
+        $HOME/ghaymah/bin/gy resource app init --project-id "${{ steps.project.outputs.PROJECT_ID }}" || echo "⚠️ App initialization had issues, continuing..."
     
     - name: Deploy to Ghaymah
       run: |
         echo "🚀 Deploying to Ghaymah..."
+        
+        # Verify .ghaymah.json exists and has valid content
+        if [ ! -f .ghaymah.json ]; then
+          echo "❌ .ghaymah.json file not found"
+          exit 1
+        fi
+        
+        # Check project ID in config file
+        if command -v jq > /dev/null; then
+          CONFIG_PROJECT_ID=$(jq -r '.projectId' .ghaymah.json)
+          if [ "$CONFIG_PROJECT_ID" = "00000000-0000-0000-0000-000000000000" ] || [ -z "$CONFIG_PROJECT_ID" ]; then
+            echo "❌ Invalid project ID in configuration: $CONFIG_PROJECT_ID"
+            exit 1
+          fi
+          echo "✅ Valid project ID in config: $CONFIG_PROJECT_ID"
+        fi
+        
+        # Deploy the application
         $HOME/ghaymah/bin/gy resource app launch
-        echo "✅ Deployment successful!"
+        
+        if [ $? -eq 0 ]; then
+          echo "✅ Deployment successful!"
+        else
+          echo "❌ Deployment failed"
+          exit 1
+        fi
     
-    - name: Show deployment info
+    - name: Show deployment summary
       run: |
-        echo "🎉 Deployment completed!"
-        echo "📊 Project: $PROJECT_NAME"
-        echo "📱 App: $APP_NAME"
+        echo ""
+        echo "🎉 DEPLOYMENT COMPLETE!"
+        echo "========================"
+        echo "📱 Application: $APP_NAME"
+        echo "🏗️  Project: $PROJECT_NAME"
+        echo "🔗 Project ID: ${{ steps.project.outputs.PROJECT_ID }}"
+        echo "🐳 Image: $DOCKER_USERNAME/$IMAGE_NAME:$IMAGE_TAG"
         echo "🌐 URL: https://${APP_NAME}.hosted.ghaymah.systems"
-        echo "✨ Deployment process completed!"
\ No newline at end of file
+        echo "========================"
\ No newline at end of file