diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aef32c9..c371d3c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,6 +8,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - name: Install dependencies
+      run: npm install
+    - name: Build the interface
+      run: npm run build
     - uses: actions/checkout@v2
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
@@ -28,7 +32,7 @@ jobs:
         tags: |
           joxit/docker-registry-ui:master
           joxit/docker-registry-ui:main
-    - name: Build and push Static version
+    - name: Build and push Static Version
       uses: docker/build-push-action@v2
       with:
         context: .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 792caaf..32d2bb6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,9 +11,9 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Install
+    - name: Install dependencies
       run: npm install
-    - name: Build
+    - name: Build the interface
       run: npm run build
     - name: Current tag
       id: current-tag
@@ -50,7 +50,7 @@ jobs:
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
         push: true
         tags: |
-          joxit/docker-registry-ui:master
+          joxit/docker-registry-ui:latest
           joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}
     - name: Build and push Static version
       uses: docker/build-push-action@v2
@@ -60,5 +60,5 @@ jobs:
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
         push: true
         tags: |
-          joxit/docker-registry-ui:master-static
+          joxit/docker-registry-ui:static
           joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}-static
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index ba6bab5..26c26ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,22 +12,10 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-FROM node:10-alpine AS builder
-
-WORKDIR /usr/app
-
-COPY package.json .
-
-RUN yarn install
-
-COPY . .
-
-RUN yarn build
-
 FROM nginx:alpine
 
 LABEL maintainer="Jones MAGLOIRE @Joxit"
 
 WORKDIR /usr/share/nginx/html/
 
-COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
\ No newline at end of file
+COPY dist/ /usr/share/nginx/html/
\ No newline at end of file
diff --git a/package.json b/package.json
index ced559b..d97399f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docker-registry-ui",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "scripts": {
     "build": "./node_modules/gulp/bin/gulp.js build",
     "build:electron": "npm run build && cd examples/electron && npm install && npm run dist"
diff --git a/static.dockerfile b/static.dockerfile
index 9459e0d..af63b8d 100644
--- a/static.dockerfile
+++ b/static.dockerfile
@@ -12,18 +12,6 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-FROM node:10-alpine AS builder
-
-WORKDIR /usr/app
-
-COPY package.json .
-
-RUN yarn install
-
-COPY . .
-
-RUN yarn build
-
 FROM nginx:alpine
 
 LABEL maintainer="Jones MAGLOIRE @Joxit"
@@ -33,6 +21,6 @@ WORKDIR /usr/share/nginx/html/
 ENV NGINX_PROXY_HEADER_Host '$http_host'
 
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
-COPY --from=builder /usr/app/dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
+COPY dist/ /usr/share/nginx/html/
+COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
 COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh