diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
new file mode 100644
index 000000000..a5b7e72df
--- /dev/null
+++ b/.github/workflows/docker-build.yml
@@ -0,0 +1,50 @@
+# This workflow will test building the Docker image for Monika.
+# For Intel based MacOS, Linux, and Windows, it will build the image for using linux/amd64 platfrom
+# For Apple Silicon, it will build the image for using linux/arm64 platfrom
+# There is a reason why we cannot build the image for MacOS and Windows using windows-latest or macos-latest.
+# Read more about it here:
+# https://github.com/docker/setup-buildx-action/issues/292
+# https://github.com/moby/buildkit/issues/616
+# https://github.com/docker/setup-qemu-action/discussions/137
+
+name: Docker Build Test
+
+on:
+  workflow_dispatch: null
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  issues: read
+  pull-requests: read
+  actions: write
+
+jobs:
+  build:
+    name: Build for ${{ matrix.os }}
+    runs-on: ${{ matrix.runs_on }}
+    strategy:
+      matrix:
+        include:
+          - os: Linux, Windows and MacOS x64
+            platform: windows
+            runs_on: ubuntu-latest
+            flags: --platform=linux/amd64
+          - os: MacOS (Apple Silicon)
+            platform: macos
+            runs_on: ubuntu-latest
+            flags: --platform=linux/arm64
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v3.1.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build the image
+        run: |
+          docker buildx build ${{ matrix.flags }} -t hyperjump/monika:${{ matrix.platform }} .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b66ff6f7c..e49998df7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.21.0] - 2024-07-19
+
+### Added
+
+Feat: Implement http response cache (#1296)
+Feat: Add custom user agent (#1300)
+
+### Fixed
+
+Fix: Handle CERT_HAS_EXPIRED_ERROR (#1299)
+Fix: Docker build fails on some OS (#1304)
+Fix: Handle ERR_TLS_CERT_ALTNAME_INVALID and improve overall error descriptions (#1309)
+
+### Changed
+
+Chore: Update oclif to v4.14.0 (#1311)
+
 ## [1.20.2] - 2024-05-16
 
 ### Fixed
diff --git a/package-lock.json b/package-lock.json
index 5e7d80ac7..1a9018545 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@hyperjumptech/monika",
-  "version": "1.20.2",
+  "version": "1.21.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@hyperjumptech/monika",
-      "version": "1.20.2",
+      "version": "1.21.0",
       "license": "MIT",
       "workspaces": [
         "packages/*"
diff --git a/package.json b/package.json
index f60907ee0..5e9079786 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hyperjumptech/monika",
   "description": "Synthetic monitoring made easy",
-  "version": "1.20.2",
+  "version": "1.21.0",
   "license": "MIT",
   "author": "@hyperjumptech",
   "main": "lib/index.js",
@@ -56,7 +56,7 @@
     "format": "prettier --write .",
     "check-format": "prettier --check .",
     "pkg": "npm run prepack && pkg . --compress brotli",
-    "pack-tarballs": "oclif pack tarballs --targets=linux-x64 --no-xz"
+    "pack-tarballs": "npm run prepack && oclif pack tarballs --targets=linux-x64 --no-xz"
   },
   "dependencies": {
     "@faker-js/faker": "^7.4.0",