diff --git a/.github/workflows/docker-image_new.yml b/.github/workflows/docker-image_new.yml
index b890879..b3da4bc 100644
--- a/.github/workflows/docker-image_new.yml
+++ b/.github/workflows/docker-image_new.yml
@@ -1,33 +1,28 @@
+---
 name: Docker Image CI
-
 on:
   push:
-    branches: [ "meters-to-ha" ]
+    branches: [meters-to-ha]
   pull_request:
-    branches: [ "meters-to-ha" ]
-
+    branches: [meters-to-ha]
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
-      
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      - uses: actions/checkout@v4
+      - name: Build the Docker image
+        run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-    # Production versions 
-    - name: Build and push
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        push: true
-        tags: vingerha/meters2ha:latest            
+      # Production versions
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ github.repository }}:latest