diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index 7429e4d..83c0ede 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -47,18 +47,6 @@ jobs:
     artifacts: Tesses.CrossLang.PackageServer-*.crvm
     condition: SUCCESSFUL
     optional: false
-  - type: BuildImageStep
-    name: Build container
-    dockerfile: Dockerfile
-    output:
-      type: RegistryOutput
-      tags: onedev.site.tesses.net/crosslang/crosslangextras/crosslangextras:latest
-    registryLogins:
-    - registryUrl: '@server_url@'
-      userName: '@job_token@'
-      passwordSecret: dockersecret
-    condition: SUCCESSFUL
-    optional: false
   - type: SCPCommandStep
     name: Copy Shell Package
     privateKeySecret: tesses_www_private_key
@@ -66,18 +54,6 @@ jobs:
     target: mike@@10.137.42.28:/var/www/downloads/ShellPackage.crvm
     condition: SUCCESSFUL
     optional: false
-  - type: BuildImageStep
-    name: Build container (package server)
-    dockerfile: Dockerfile.packageserver
-    output:
-      type: RegistryOutput
-      tags: onedev.site.tesses.net/crosslang/crosslangextras/packageserver:latest
-    registryLogins:
-    - registryUrl: '@server_url@'
-      userName: '@job_token@'
-      passwordSecret: dockersecret
-    condition: SUCCESSFUL
-    optional: false
   - type: CommandStep
     name: Push packages to CPKG
     runInContainer: true
@@ -117,6 +93,30 @@ jobs:
     useTTY: true
     condition: SUCCESSFUL
     optional: false
+  - type: BuildImageStep
+    name: Build container
+    dockerfile: Dockerfile
+    output:
+      type: RegistryOutput
+      tags: onedev.site.tesses.net/crosslang/crosslangextras/crosslangextras:latest
+    registryLogins:
+    - registryUrl: '@server_url@'
+      userName: '@job_token@'
+      passwordSecret: dockersecret
+    condition: SUCCESSFUL
+    optional: false
+  - type: BuildImageStep
+    name: Build container (package server)
+    dockerfile: Dockerfile.packageserver
+    output:
+      type: RegistryOutput
+      tags: onedev.site.tesses.net/crosslang/crosslangextras/packageserver:latest
+    registryLogins:
+    - registryUrl: '@server_url@'
+      userName: '@job_token@'
+      passwordSecret: dockersecret
+    condition: SUCCESSFUL
+    optional: false
   - type: CommandStep
     name: push to coolify
     runInContainer: true
diff --git a/Dockerfile b/Dockerfile
index 85b2571..2c68fd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM onedev.site.tesses.net/crosslang/crosslang:latest
 
-COPY ./Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm /root/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
-
+RUN crosslang update-shell
 RUN crossarchiveextract /root/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm /root/.config/Tesses/CrossLang
\ No newline at end of file