diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
new file mode 100644
index 00000000..672f4455
--- /dev/null
+++ b/.github/workflows/environment.yml
@@ -0,0 +1,50 @@
+name: Demo
+
+on: [push, pull_request]
+
+jobs:
+  linux:
+    name: Linux Demo
+    runs-on: ubuntu-latest
+    steps:
+      - uses: FranzDiebold/github-env-vars-action@v2
+      - name: Print environment variables exposed by this action
+        run: |
+          set 
+          echo "CI_REPOSITORY_SLUG=$CI_REPOSITORY_SLUG"
+          echo "CI_REPOSITORY_OWNER=$CI_REPOSITORY_OWNER"
+          echo "CI_REPOSITORY_OWNER_SLUG=$CI_REPOSITORY_OWNER_SLUG"
+          echo "CI_REPOSITORY_NAME=$CI_REPOSITORY_NAME"
+          echo "CI_REPOSITORY_NAME_SLUG=$CI_REPOSITORY_NAME_SLUG"
+          echo "CI_REPOSITORY=$CI_REPOSITORY"
+          echo "CI_REF_SLUG=$CI_REF_SLUG"
+          echo "CI_ACTION_REF_NAME=$CI_ACTION_REF_NAME"
+          echo "CI_ACTION_REF_NAME_SLUG=$CI_ACTION_REF_NAME_SLUG"
+          echo "CI_REF_NAME=$CI_REF_NAME"
+          echo "CI_REF_NAME_SLUG=$CI_REF_NAME_SLUG"
+          echo "CI_REF=$CI_REF"
+          echo "CI_HEAD_REF_SLUG=$CI_HEAD_REF_SLUG"
+          echo "CI_HEAD_REF=$CI_HEAD_REF"
+          echo "CI_BASE_REF_SLUG=$CI_BASE_REF_SLUG"
+          echo "CI_BASE_REF=$CI_BASE_REF"
+          echo "CI_SHA_SHORT=$CI_SHA_SHORT"
+          echo "CI_SHA=$CI_SHA"
+          echo "CI_ACTOR=$CI_ACTOR"
+          echo "CI_EVENT_NAME=$CI_EVENT_NAME"
+          echo "CI_RUN_ID=$CI_RUN_ID"
+          echo "CI_RUN_NUMBER=$CI_RUN_NUMBER"
+          echo "CI_WORKFLOW=$CI_WORKFLOW"
+          echo "CI_ACTION=$CI_ACTION"
+      - name: Print environment variables exposed by GitHub
+        run: |
+          echo "GITHUB_ACTOR=$GITHUB_ACTOR"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+          echo "GITHUB_SHA=$GITHUB_SHA"
+          echo "GITHUB_REF=$GITHUB_REF"
+          echo "GITHUB_HEAD_REF=$GITHUB_HEAD_REF"
+          echo "GITHUB_BASE_REF=$GITHUB_BASE_REF"
+          echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
+          echo "GITHUB_RUN_ID=$GITHUB_RUN_ID"
+          echo "GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER"
+          echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
+          echo "GITHUB_ACTION=$GITHUB_ACTION"
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 7bc3ddff..d8755615 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -1,42 +1,45 @@
 name: Publish Docker
 
-on: 
-  pull_request:
-        branches: 
-        - 'develop'
-        - 'master' 
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-       - uses: FranzDiebold/github-env-vars-action@v2
-       - name: Set Environment Variables
-         run: |
-             echo "BUILD_VER=v0.0.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
-       -
-        name: Checkout
-        uses: actions/checkout@v2
-       -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-       -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-       -
-        name: Login to DockerHub
-        uses: docker/login-action@v1 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-       -
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/amd64, linux/arm64
-          push: true
-          tags: |
-              nusak/netmaker:${{ env.CI_REF_NAME_SLUG }}
-              nusak/netmaker:${{ env.BUILD_VER }}
-            
-
+on:
+    pull_request:
+        branches:
+            - 'develop'
+            - 'master'
+    docker:
+        runs-on: ubuntu-latest
+        steps:
+            -
+                uses: FranzDiebold/github-env-vars-action@v2
+                name: Set Environment Variables
+                run: |
+                    echo "BUILD_VER=v0.0.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
+                    if [ ${{ CI_HED_REF }} = "master" ]
+                    then
+                        echo "TAG=latest" >>$GITHUB_ENV
+                    else
+                        echo "TAG=$CI_HEAD_REF" >> $GITHUB_ENV
+                    done
+            -
+                name: Checkout
+                uses: actions/checkout@v2
+            -
+                name: Set up QEMU
+                uses: docker/setup-qemu-action@v1
+            -
+                name: Set up Docker Buildx
+                uses: docker/setup-buildx-action@v1
+            -
+                name: Login to DockerHub
+                uses: docker/login-action@v1
+                with:
+                username: ${{ secrets.DOCKERHUB_USERNAME }}
+                password: ${{ secrets.DOCKERHUB_TOKEN }}
+            -
+                name: Build and push
+                uses: docker/build-push-action@v2
+                with:
+                context: .
+                platforms: linux/amd64, linux/arm64
+                push: false
+                tags: |
+                    nusak/netmaker:${{ env.TAG }}