diff --git a/.gitea/workflows/ssh-client-build-deploy.yaml b/.gitea/workflows/ssh-client-build-deploy.yaml
index 280e676..4f21173 100644
--- a/.gitea/workflows/ssh-client-build-deploy.yaml
+++ b/.gitea/workflows/ssh-client-build-deploy.yaml
@@ -8,7 +8,7 @@ on:
   
 jobs:
  
-  ssh-client:
+  ssh-client-container-build-push: 
     runs-on: ["oci-image-builder", "amd64"]
 
     steps:
@@ -32,7 +32,7 @@ jobs:
           registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }}
           buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
           dockerfile: ${{gitea.workspace}}/docker/ssh-client
-          context: .
+          context: ${{gitea.workspace}}/docker/ssh-client
 
 
 
diff --git a/.gitea/workflows/ssh-server-build-deploy.yaml b/.gitea/workflows/ssh-server-build-deploy.yaml
index 80d5178..9603d9a 100644
--- a/.gitea/workflows/ssh-server-build-deploy.yaml
+++ b/.gitea/workflows/ssh-server-build-deploy.yaml
@@ -8,7 +8,7 @@ on:
   
 jobs:
  
-  ssh-server: 
+  ssh-server-container-build-push: 
     runs-on: ["oci-image-builder", "amd64"]
     defaults:
       run:
@@ -16,13 +16,24 @@ jobs:
         
     steps:
  
-      - name: Checkout code
-        uses: actions/checkout@v2
-   
-      - name: Build ssh-server images
-        run: BUILD_ENV=prod ./scripts/build.sh
 
-      - name: Push image
-        run: docker push git.limbosolutions.com/kb/ssh-server
-      
+      - name: Fetch limbo public actions
+        env: 
+          RUNNER_TEMP: "${{ runner.temp }}"
+          WORKSPACE: "${{ gitea.workspace }}"
+        run: |
+          curl -fsSL https://git.limbosolutions.com/kb/gitea/raw/branch/main/cloud-scripts/setup-limbo-actions.sh | bash 2>&1
+   
+      - name: Build and push ssh-image container image
+        uses: ./.gitea/limbo_actions/buildkit-build-push
+        with:
+          tags: git.limbosolutions.com/kb/ssh-server
+          registry_addr: ${{ vars.GITLIMBO_DOCKER_REGISTRY_ADDRESS }}
+          registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }}
+          registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }}
+          buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
+          dockerfile: ${{gitea.workspace}}/docker/ssh-server
+          context: ${{gitea.workspace}}/docker/ssh-server
+
+
       
\ No newline at end of file