diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index ea2920a4f9..05fe350743 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -1,4 +1,4 @@
-name: Build and Push Docker image to my DockerHub repo
+name: Docker image CI/CD
 
 on:
   pull_request:
@@ -20,10 +20,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: Build Docker Image
-        run: |
-          docker build -t mtotovski/go-ethereum:latest .
-
-      - name: Push Docker Image
-        run: |
-          docker push mtotovski/go-ethereum:latest
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          tags: mtotovski/go-ethereum:latest
+          push: true
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 9b99d4f809..78410aab10 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
     - uses: actions/checkout@v4