diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 62d4381..d53d416 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -17,4 +17,10 @@ jobs:
     steps:
       - run: |
           export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owprov-ui/$PR_BRANCH_TAG"
+
+          if [[ ! $PR_BRANCH_TAG =~ (main|master|release-*) ]]; then
+            echo "PR branch is $PR_BRANCH_TAG, deleting Docker image"
+            curl -s -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owprov-ui/$PR_BRANCH_TAG"
+          else
+            echo "PR branch is $PR_BRANCH_TAG, not deleting Docker image"
+          fi
diff --git a/Dockerfile b/Dockerfile
index 0a8ae2d..4084e55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
-FROM node:16-alpine3.15 AS build
-COPY package.json package-lock.json /
+FROM node:18.7.0-alpine3.15 AS build
+WORKDIR /app
+COPY package.json package-lock.json /app/
 COPY . .
 RUN npm install
 RUN npm run build
 
-FROM nginx:1.21.3-alpine AS runtime
-COPY --from=build /build/ /usr/share/nginx/html/
-COPY --from=build docker-entrypoint.d/40-generate-config.sh /docker-entrypoint.d/40-generate-config.sh
+FROM nginx:1.22.0-alpine AS runtime
+COPY --from=build /app//build/ /usr/share/nginx/html/
+COPY --from=build /app/docker-entrypoint.d/40-generate-config.sh /docker-entrypoint.d/40-generate-config.sh