diff --git a/.github/workflows/branch_name_validation.yml b/.github/workflows/branch_name_validation.yml
index c4efe74..1ed0ce6 100644
--- a/.github/workflows/branch_name_validation.yml
+++ b/.github/workflows/branch_name_validation.yml
@@ -3,7 +3,7 @@ on: pull_request
 
 jobs:
   branch-naming-rules:
-    runs-on: self-hosted
+    runs-on: arc-runner-set
     steps:
       - uses: deepakputhraya/action-branch-name@master
         with:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index da14a5f..f59d116 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: self-hosted
+    runs-on: arc-runner-set
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/on_merge_main.yml b/.github/workflows/on_merge_main.yml
index e8441e0..6053559 100644
--- a/.github/workflows/on_merge_main.yml
+++ b/.github/workflows/on_merge_main.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   deploy-app:
-    runs-on: self-hosted
+    runs-on: arc-runner-set
     defaults:
       run:
         shell: bash
diff --git a/.github/workflows/on_push_development.yml b/.github/workflows/on_push_development.yml
index 289e8d3..0b2c902 100644
--- a/.github/workflows/on_push_development.yml
+++ b/.github/workflows/on_push_development.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   deploy-app:
-    runs-on: self-hosted
+    runs-on: arc-runner-set
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/build.sh b/build.sh
index a8ba9d4..5b07b66 100755
--- a/build.sh
+++ b/build.sh
@@ -2,16 +2,10 @@
 
 yarn build:prod
 
-ID=$(docker build -q .)
+ID=$(docker buildx build --platform linux/amd64,linux/arm64 -t alexbrown201/devnotnull-ui:latest -t alexbrown201/devnotnull-ui:2.0 --push .)
 
 echo the id $ID
 
-docker tag $ID alexbrown201/devnotnull-ui:latest
-docker tag $ID alexbrown201/devnotnull-ui:2.0
-
-docker push alexbrown201/devnotnull-ui:latest
-docker push alexbrown201/devnotnull-ui:2.0
-
 aws s3 cp ./build s3://devnotnull-ui-production --recursive
 
 aws s3api put-bucket-cors --bucket devnotnull-ui-production --cors-configuration '{"CORSRules" : [{"AllowedHeaders":["*"],"AllowedMethods":["GET","HEAD", "POST"],"AllowedOrigins":["*"],"ExposeHeaders":[]}]}'