diff --git a/.gitea/workflows/dockerio.yaml b/.gitea/workflows/dockerio.yaml
new file mode 100644
index 0000000..7ed6de2
--- /dev/null
+++ b/.gitea/workflows/dockerio.yaml
@@ -0,0 +1,44 @@
+name: Build and Push Ubuntu Image to docker.io Registry
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build and push image
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Login to docker.io Registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: aprimediet
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Build and push 22.04 / jammy
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          build-args: |
+            UBUNTU_VERSION=jammy
+          push: true
+          tags: |
+            aprimediet/ubuntu:22.04
+            aprimediet/ubuntu:jammy
+      - name: Build and push 24.04 / noble
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          build-args: |
+            UBUNTU_VERSION=noble
+          push: true
+          tags: |
+            aprimediet/ubuntu:24.04
+            aprimediet/ubuntu:noble
+            aprimediet/ubuntu:latest
\ No newline at end of file
diff --git a/.gitea/workflows/master.yaml b/.gitea/workflows/winter.yaml
similarity index 63%
rename from .gitea/workflows/master.yaml
rename to .gitea/workflows/winter.yaml
index f47ccfd..c1293dd 100644
--- a/.gitea/workflows/master.yaml
+++ b/.gitea/workflows/winter.yaml
@@ -1,4 +1,4 @@
-name: Build and Push Ubuntu Image
+name: Build and Push Ubuntu Image to Winter Access Registry
 on:
   push:
     branches:
@@ -30,4 +30,15 @@ jobs:
           tags: |
             git.winteraccess.id/${{ gitea.repository }}:22.04
             git.winteraccess.id/${{ gitea.repository }}:jammy
+      - name: Build and push 24.04 / noble
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          build-args: |
+            UBUNTU_VERSION=noble
+          push: true
+          tags: |
+            git.winteraccess.id/${{ gitea.repository }}:24.04
+            git.winteraccess.id/${{ gitea.repository }}:jammy
             git.winteraccess.id/${{ gitea.repository }}:latest
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 37f3b20..2a26e34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-ARG UBUNTU_VERSION=jammy
+ARG UBUNTU_VERSION=noble
 
 FROM ubuntu:${UBUNTU_VERSION} AS base
 LABEL maintainer="<Aditya Prima> aprimediet@gmail.com"
 
-ARG UBUNTU_VERSION=jammy
+ARG UBUNTU_VERSION=noble
 # ARG UBUNTU_MIRROR=http://repo.ugm.ac.id/ubuntu
 # ARG SECURITY_MIRROR=http://security.ubuntu.com/ubuntu