diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2d49002..ec5bd69 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,6 +7,17 @@ on:
       - dev
 
 jobs:
+
+  login:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
   build-and-push:
     runs-on: ubuntu-latest
 
@@ -14,13 +25,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Login to Docker Hub
-        run: echo ${{ secrets.DOCKER_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-
-
       - name: Build and push Docker image
         env:
-          DOCKER_IMAGE_NAME: your-docker-image-name
+          DOCKER_IMAGE_NAME: tibber-influx
         run: |
           if [ "${{ github.ref }}" == "refs/heads/main" ]; then
             DOCKER_TAG="latest"
@@ -29,7 +36,7 @@ jobs:
           else
             DOCKER_TAG="other"
           fi
-          
+
           docker build -t $DOCKER_IMAGE_NAME .
-          docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
+          docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
+          docker push ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG