diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index f1c8f417..22e252bb 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-qemu-action@v1.1.0
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.3.0
       -
         name: Cache Docker layers
         uses: actions/cache@v2.1.5
@@ -37,7 +37,8 @@ jobs:
             ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.9.0 
+        uses: docker/login-action@v1.9.0
+        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index ee441e2d..c42420d5 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -13,8 +13,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2.3.4
     - name: lint
-      uses: luke142367/Docker-Lint-Action@v1.1.1
+      uses: hadolint/hadolint-action@v1.5.0
       with:
-        target: Dockerfile
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        dockerfile: Dockerfile
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 8d4a93f8..c28167b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,5 +16,5 @@ FROM nginx:1-alpine
 LABEL org.opencontainers.image.source="https://github.com/wbstack/queryservice-ui"
 
 
-ADD ./docker/default.conf /etc/nginx/conf.d/default.conf
+COPY ./docker/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder --chown=nginx:nginx /src/app/build /usr/share/nginx/html