diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 746d648..75bcb38 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -28,10 +28,10 @@ jobs:
 
       - name: Deploy API Container
         run: |
-          docker rm -f sanstudent-api || true
+          docker rm -f sanstudent-api-container || true
           docker network create san-network || true
           docker run -d \
-            --name sanstudent-api \
+            --name sanstudent-api-container \
             --network san-network \
             -p 8083:8080 \
             -e ConnectionStrings__DefaultConnection="${{ secrets.DB_CONNECTION_STRING }}" \
@@ -49,16 +49,16 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build FrontAdmin Image
-        run: docker build -t sanstudent-admin:latest -f FrontAdmin/Dockerfile .
+        run: docker build -t sanstudent-frontadmin:latest -f FrontAdmin/Dockerfile .
 
       - name: Deploy FrontAdmin Container
         run: |
-          docker rm -f sanstudent-admin || true
+          docker rm -f sanstudent-admin-container || true
           docker run -d \
-            --name sanstudent-admin \
+            --name sanstudent-admin-container \
             -p 8081:80 \
             --restart always \
-            sanstudent-admin:latest
+            sanstudent-frontadmin:latest
 
   # ==========================================
   # 3. FRONTSTUDENT (Blazor WebAssembly)
@@ -70,13 +70,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build FrontStudent Image
-        run: docker build -t sanstudent-student:latest -f FrontStudent/Dockerfile .
+        run: docker build -t sanstudent-frontstudent:latest -f FrontStudent/Dockerfile .
 
       - name: Deploy FrontStudent Container
         run: |
-          docker rm -f sanstudent-student || true
+          docker rm -f sanstudent-student-container || true
           docker run -d \
-            --name sanstudent-student \
+            --name sanstudent-student-container \
             -p 8082:80 \
             --restart always \
-            sanstudent-student:latest
\ No newline at end of file
+            sanstudent-frontstudent:latest
\ No newline at end of file