diff --git a/.gitea/workflows/jammy.yaml b/.gitea/workflows/master.yaml
similarity index 66%
rename from .gitea/workflows/jammy.yaml
rename to .gitea/workflows/master.yaml
index bb4963c..ee9abfb 100644
--- a/.gitea/workflows/jammy.yaml
+++ b/.gitea/workflows/master.yaml
@@ -19,7 +19,13 @@ jobs:
           registry: git.winteraccess.id
           username: aditya.prima
           password: ${{ secrets.PATOKEN }}
-      - name: Build and push
+      - name: Login to Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: aprimediet
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Build and push jammy / 22.04
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -28,6 +34,9 @@ jobs:
             UBUNTU_VERSION=jammy
           push: true
           tags: |
-            git.winteraccess.id/${{ gitea.repository }}:latest
+            git.winteraccess.id/${{ gitea.repository }}:jammy
             git.winteraccess.id/${{ gitea.repository }}:22.04
-            git.winteraccess.id/${{ gitea.repository }}:jammy
\ No newline at end of file
+            git.winteraccess.id/${{ gitea.repository }}:latest
+            aprimediet/ubuntu-s6:jammy
+            aprimediet/ubuntu-s6:22.04
+            aprimediet/ubuntu-s6:latest
diff --git a/Dockerfile b/Dockerfile
index 2cb6462..112620d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,9 @@ FROM ubuntu:${UBUNTU_VERSION} AS base
 LABEL maintainer="<Aditya Prima> aprimediet@gmail.com"
 
 ARG UBUNTU_VERSION=jammy
-ARG S6_VERSION=3.1.5.0
-ARG UBUNTU_MIRROR=http://repo.ugm.ac.id/ubuntu
-ARG SECURITY_MIRROR=http://security.ubuntu.com/ubuntu
+ARG S6_VERSION=3.1.6.2
+# ARG UBUNTU_MIRROR=http://repo.ugm.ac.id/ubuntu
+# ARG SECURITY_MIRROR=http://security.ubuntu.com/ubuntu
 
 ENV DEBIAN_FRONTEND noninteractive
 # ADJUST LOCAL TIME
@@ -16,11 +16,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # Set User as root
 USER root
 
-RUN touch /etc/apt/sources.list
-RUN echo "deb ${UBUNTU_MIRROR}/ ${UBUNTU_VERSION} main restricted universe multiverse" > /etc/apt/sources.list
-RUN echo "deb ${UBUNTU_MIRROR}/ ${UBUNTU_VERSION}-updates main restricted universe multiverse" >> /etc/apt/sources.list
-RUN echo "deb ${UBUNTU_MIRROR}/ ${UBUNTU_VERSION}-backports main restricted universe multiverse" >> /etc/apt/sources.list
-RUN echo "deb ${SECURITY_MIRROR}/ ${UBUNTU_VERSION}-security main restricted universe multiverse" >> /etc/apt/sources.list
+# RUN touch /etc/apt/sources.list
+# RUN echo "deb ${UBUNTU_MIRROR}/ ${UBUNTU_VERSION} main restricted universe multiverse" > /etc/apt/sources.list
+# RUN echo "deb ${UBUNTU_MIRROR}/ ${UBUNTU_VERSION}-updates main restricted universe multiverse" >> /etc/apt/sources.list
+# RUN echo "deb ${UBUNTU_MIRROR}/ ${UBUNTU_VERSION}-backports main restricted universe multiverse" >> /etc/apt/sources.list
+# RUN echo "deb ${SECURITY_MIRROR}/ ${UBUNTU_VERSION}-security main restricted universe multiverse" >> /etc/apt/sources.list
 
 # Install base dependencies
 RUN --mount=type=cache,target=/var/cache/apt/archives \