diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..34ecb9c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{template}]
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
index bb3a15f..37095ca 100644
--- a/.github/workflows/on-pull-request.yaml
+++ b/.github/workflows/on-pull-request.yaml
@@ -18,6 +18,9 @@ jobs:
         run: |
           Install-Module InvokeBuild -Force
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Build
         shell: pwsh
         run: |
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 47c1899..96396c9 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -24,6 +24,9 @@ jobs:
         run: |
           Install-Module InvokeBuild -Force
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Build
         shell: pwsh
         run: |
diff --git a/assets.json b/assets.json
index ef57420..ec2627e 100644
--- a/assets.json
+++ b/assets.json
@@ -1,249 +1,316 @@
 [
-    {
-        "version":  "5.0.1",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz",
-        "sha256":  "e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57",
-        "tags":  {
-                     "bookworm":  [
-                                      "5",
-                                      "5.0.1",
-                                      "latest"
-                                  ],
-                     "bullseye":  [
-                                      "bullseye",
-                                      "5-bullseye",
-                                      "5.0.1-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "jammy",
-                                   "5-jammy",
-                                   "5.0.1-jammy"
-                               ],
-                     "noble":  [
-                                   "noble",
-                                   "5-noble",
-                                   "5.0.1-noble"
-                               ]
-                 }
+  {
+    "version": "3.0.12",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz",
+        "sha256": "406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f"
+      }
     },
-    {
-        "version":  "5.0.0",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz",
-        "sha256":  "137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768",
-        "tags":  {
-                     "bookworm":  [
-                                      "5.0.0"
-                                  ],
-                     "bullseye":  [
-                                      "5.0.0-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "5.0.0-jammy"
-                               ],
-                     "noble":  [
-                                   "5.0.0-noble"
-                               ]
-                 }
-    },
-    {
-        "version":  "4.0.5",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz",
-        "sha256":  "6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6",
-        "tags":  {
-                     "bookworm":  [
-                                      "4",
-                                      "4.0.5"
-                                  ],
-                     "bullseye":  [
-                                      "4-bullseye",
-                                      "4.0.5-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "4-jammy",
-                                   "4.0.5-jammy"
-                               ],
-                     "noble":  [
-                                   "4-noble",
-                                   "4.0.5-noble"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "3",
+        "3.0.12",
+        "latest"
+      ],
+      "bullseye": [
+        "bullseye",
+        "3-bullseye",
+        "3.0.12-bullseye"
+      ],
+      "jammy": [
+        "jammy",
+        "3-jammy",
+        "3.0.12-jammy"
+      ]
+    }
+  },
+  {
+    "version": "3.0.11",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz",
+        "sha256": "713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e"
+      }
     },
-    {
-        "version":  "4.0.4",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz",
-        "sha256":  "ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca",
-        "tags":  {
-                     "bookworm":  [
-                                      "4.0.4"
-                                  ],
-                     "bullseye":  [
-                                      "4.0.4-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "4.0.4-jammy"
-                               ],
-                     "noble":  [
-                                   "4.0.4-noble"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "3.0.11"
+      ],
+      "bullseye": [
+        "3.0.11-bullseye"
+      ],
+      "jammy": [
+        "3.0.11-jammy"
+      ]
+    }
+  },
+  {
+    "version": "3.0.10",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz",
+        "sha256": "5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0"
+      }
     },
-    {
-        "version":  "4.0.3",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz",
-        "sha256":  "bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d",
-        "tags":  {
-                     "bookworm":  [
-                                      "4.0.3"
-                                  ],
-                     "bullseye":  [
-                                      "4.0.3-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "4.0.3-jammy"
-                               ],
-                     "noble":  [
-                                   "4.0.3-noble"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "3.0.10"
+      ],
+      "bullseye": [
+        "3.0.10-bullseye"
+      ],
+      "jammy": [
+        "3.0.10-jammy"
+      ]
+    }
+  },
+  {
+    "version": "3.0.9",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz",
+        "sha256": "0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4"
+      }
     },
-    {
-        "version":  "4.0.2",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz",
-        "sha256":  "70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa",
-        "tags":  {
-                     "bookworm":  [
-                                      "4.0.2"
-                                  ],
-                     "bullseye":  [
-                                      "4.0.2-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "4.0.2-jammy"
-                               ],
-                     "noble":  [
-                                   "4.0.2-noble"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "3.0.9"
+      ],
+      "bullseye": [
+        "3.0.9-bullseye"
+      ],
+      "jammy": [
+        "3.0.9-jammy"
+      ]
+    }
+  },
+  {
+    "version": "3.0.8",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz",
+        "sha256": "fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9"
+      }
     },
-    {
-        "version":  "4.0.1",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz",
-        "sha256":  "90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998",
-        "tags":  {
-                     "bookworm":  [
-                                      "4.0.1"
-                                  ],
-                     "bullseye":  [
-                                      "4.0.1-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "4.0.1-jammy"
-                               ],
-                     "noble":  [
-                                   "4.0.1-noble"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "3.0.8"
+      ],
+      "bullseye": [
+        "3.0.8-bullseye"
+      ],
+      "jammy": [
+        "3.0.8-jammy"
+      ]
+    }
+  },
+  {
+    "version": "4.0.5",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz",
+        "sha256": "6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6"
+      }
     },
-    {
-        "version":  "4.0.0",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz",
-        "sha256":  "06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e",
-        "tags":  {
-                     "bookworm":  [
-                                      "4.0.0"
-                                  ],
-                     "bullseye":  [
-                                      "4.0.0-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "4.0.0-jammy"
-                               ],
-                     "noble":  [
-                                   "4.0.0-noble"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "4",
+        "4.0.5"
+      ],
+      "bullseye": [
+        "4-bullseye",
+        "4.0.5-bullseye"
+      ],
+      "jammy": [
+        "4-jammy",
+        "4.0.5-jammy"
+      ],
+      "noble": [
+        "4-noble",
+        "4.0.5-noble"
+      ]
+    }
+  },
+  {
+    "version": "4.0.4",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz",
+        "sha256": "ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca"
+      }
     },
-    {
-        "version":  "3.0.12",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz",
-        "sha256":  "406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f",
-        "tags":  {
-                     "bookworm":  [
-                                      "3",
-                                      "3.0.12"
-                                  ],
-                     "bullseye":  [
-                                      "3-bullseye",
-                                      "3.0.12-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "3-jammy",
-                                   "3.0.12-jammy"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "4.0.4"
+      ],
+      "bullseye": [
+        "4.0.4-bullseye"
+      ],
+      "jammy": [
+        "4.0.4-jammy"
+      ],
+      "noble": [
+        "4.0.4-noble"
+      ]
+    }
+  },
+  {
+    "version": "4.0.3",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz",
+        "sha256": "bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d"
+      }
     },
-    {
-        "version":  "3.0.11",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz",
-        "sha256":  "713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e",
-        "tags":  {
-                     "bookworm":  [
-                                      "3.0.11"
-                                  ],
-                     "bullseye":  [
-                                      "3.0.11-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "3.0.11-jammy"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "4.0.3"
+      ],
+      "bullseye": [
+        "4.0.3-bullseye"
+      ],
+      "jammy": [
+        "4.0.3-jammy"
+      ],
+      "noble": [
+        "4.0.3-noble"
+      ]
+    }
+  },
+  {
+    "version": "4.0.2",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz",
+        "sha256": "70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa"
+      }
     },
-    {
-        "version":  "3.0.10",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz",
-        "sha256":  "5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0",
-        "tags":  {
-                     "bookworm":  [
-                                      "3.0.10"
-                                  ],
-                     "bullseye":  [
-                                      "3.0.10-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "3.0.10-jammy"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "4.0.2"
+      ],
+      "bullseye": [
+        "4.0.2-bullseye"
+      ],
+      "jammy": [
+        "4.0.2-jammy"
+      ],
+      "noble": [
+        "4.0.2-noble"
+      ]
+    }
+  },
+  {
+    "version": "4.0.1",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz",
+        "sha256": "90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998"
+      }
     },
-    {
-        "version":  "3.0.9",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz",
-        "sha256":  "0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4",
-        "tags":  {
-                     "bookworm":  [
-                                      "3.0.9"
-                                  ],
-                     "bullseye":  [
-                                      "3.0.9-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "3.0.9-jammy"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "4.0.1"
+      ],
+      "bullseye": [
+        "4.0.1-bullseye"
+      ],
+      "jammy": [
+        "4.0.1-jammy"
+      ],
+      "noble": [
+        "4.0.1-noble"
+      ]
+    }
+  },
+  {
+    "version": "4.0.0",
+    "releases": {
+      "amd64": {
+        "url": "https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz",
+        "sha256": "06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e"
+      }
     },
-    {
-        "version":  "3.0.8",
-        "url":  "https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz",
-        "sha256":  "fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9",
-        "tags":  {
-                     "bookworm":  [
-                                      "3.0.8"
-                                  ],
-                     "bullseye":  [
-                                      "3.0.8-bullseye"
-                                  ],
-                     "jammy":  [
-                                   "3.0.8-jammy"
-                               ]
-                 }
+    "tags": {
+      "bookworm": [
+        "4.0.0"
+      ],
+      "bullseye": [
+        "4.0.0-bullseye"
+      ],
+      "jammy": [
+        "4.0.0-jammy"
+      ],
+      "noble": [
+        "4.0.0-noble"
+      ]
+    }
+  },
+  {
+    "version": "5.0.1",
+    "releases": [
+      {
+        "arm64": {
+          "url": "https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-arm64.tar.gz",
+          "sha256": "46b3f4f170458a93365c67118c062ba8509903fe8293bf8a62e7bd8a388e2d06"
+        }
+      },
+      {
+        "amd64": {
+          "url": "https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz",
+          "sha256": "e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57"
+        }
+      }
+    ],
+    "tags": {
+      "bookworm": [
+        "5",
+        "5.0.1"
+      ],
+      "bullseye": [
+        "5-bullseye",
+        "5.0.1-bullseye"
+      ],
+      "jammy": [
+        "5-jammy",
+        "5.0.1-jammy"
+      ],
+      "noble": [
+        "5-noble",
+        "5.0.1-noble"
+      ]
+    }
+  },
+  {
+    "version": "5.0.0",
+    "releases": [
+      {
+        "arm64": {
+          "url": "https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-arm64.tar.gz",
+          "sha256": "bdb62abc91a4c26a86b9377256529622e3046f4ec4f66fbdcf46747688d45033"
+        }
+      },
+      {
+        "amd64": {
+          "url": "https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz",
+          "sha256": "137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768"
+        }
+      }
+    ],
+    "tags": {
+      "bookworm": [
+        "5.0.0"
+      ],
+      "bullseye": [
+        "5.0.0-bullseye"
+      ],
+      "jammy": [
+        "5.0.0-jammy"
+      ],
+      "noble": [
+        "5.0.0-noble"
+      ]
     }
+  }
 ]
diff --git a/firebird-docker.build.ps1 b/firebird-docker.build.ps1
index 5191ae2..86d3d82 100644
--- a/firebird-docker.build.ps1
+++ b/firebird-docker.build.ps1
@@ -25,7 +25,7 @@ function Expand-Template([Parameter(ValueFromPipeline = $true)]$Template) {
 
 function Copy-TemplateItem([string]$Path, [string]$Destination, [switch]$Force) {
     if (Test-Path $Destination) {
-        # File already exists. 
+        # File already exists.
 
         if ($Force) {
             # With -Force: Overwrite.
@@ -107,10 +107,10 @@ task Update-Assets {
     # Ignore legacy and prerelease
     $currentReleases = $releases | Where-Object { ($_.tag_name -like 'v*') -and (-not $_.prerelease) }
 
-    # Select only amd64 and non-debug assets
+    # Select only amd64/arm64 and non-debug assets
     $currentAssets = $currentReleases |
         Select-Object -Property @{ Name='version'; Expression={ [version]$_.tag_name.TrimStart("v") } },
-                                @{ Name='download_url'; Expression={ $_.assets.browser_download_url | Where-Object { ( $_ -like '*amd64*' -or $_ -like '*linux-x64*') -and ($_ -notlike '*debug*') } } } |
+                                @{ Name='download_url'; Expression={ $_.assets.browser_download_url | Where-Object { ( $_ -like '*amd64*' -or $_ -like '*linux-x64*' -or $_ -like '*linux-arm64*') -and ($_ -notlike '*debug*') } } } |
         Sort-Object -Property version -Descending
 
     # Group by major version
@@ -137,14 +137,35 @@ task Update-Assets {
             $otherVariants = $allOtherVariants | Where-Object { $_ -notin $blockedVariants."$($asset.major)" }
             $variants = $allVariants | Where-Object { $_ -notin $blockedVariants."$($asset.major)" }
 
-            $assetFileName = ([uri]$asset.download_url).Segments[-1]
-            $assetLocalFile = Join-Path $assetsFolder $assetFileName
-            if (-not (Test-Path $assetLocalFile)) {
-                $ProgressPreference = 'SilentlyContinue'    # How NOT to implement a progress bar -- https://stackoverflow.com/a/43477248
-                Invoke-WebRequest $asset.download_url -OutFile $assetLocalFile
-            }
+            $releases = $asset.download_url | ForEach-Object {
+                $url = [uri]$_
+                $assetFileName = $url.Segments[-1]
+                $assetLocalFile = Join-Path $assetsFolder $assetFileName
+                if (-not (Test-Path $assetLocalFile)) {
+                    $ProgressPreference = 'SilentlyContinue'    # How NOT to implement a progress bar -- https://stackoverflow.com/a/43477248
+                    Invoke-WebRequest $url -OutFile $assetLocalFile
+                }
 
-            $sha256 = Get-FileHash $assetLocalFile -Algorithm SHA256
+                $sha256 = (Get-FileHash $assetLocalFile -Algorithm SHA256).Hash.ToLower()
+
+                if ($url -like '*arm64*') {
+                    [ordered]@{
+                        arm64 =
+                            [ordered]@{
+                                url = $url
+                                sha256 = $sha256
+                            }
+                    }
+                } else {
+                    [ordered]@{
+                        amd64 =
+                            [ordered]@{
+                                url = $url
+                                sha256 = $sha256
+                            }
+                    }
+                }
+            }
 
             $tags = [ordered]@{}
 
@@ -171,8 +192,7 @@ task Update-Assets {
 
             Write-Output ([ordered]@{
                 'version' = "$($asset.version)"
-                'url' = $asset.download_url
-                'sha256' = $sha256.Hash.ToLower()
+                'releases' = $releases
                 'tags' = $tags
             })
 
@@ -185,7 +205,7 @@ task Update-Assets {
 # Synopsis: Rebuild "README.md" from "assets.json".
 task Update-Readme {
     # For each asset
-    $assets = Get-Content -Raw -Path '.\assets.json' | ConvertFrom-Json 
+    $assets = Get-Content -Raw -Path '.\assets.json' | ConvertFrom-Json
     $TSupportedTags = $assets | ForEach-Object {
         $asset = $_
 
@@ -218,7 +238,7 @@ task Prepare {
     New-Item -ItemType Directory $outputFolder -Force > $null
 
     # For each asset
-    $assets = Get-Content -Raw -Path '.\assets.json' | ConvertFrom-Json 
+    $assets = Get-Content -Raw -Path '.\assets.json' | ConvertFrom-Json
     $assets | ForEach-Object {
         $asset = $_
 
@@ -230,8 +250,15 @@ task Prepare {
         $asset.tags | Get-Member -MemberType NoteProperty | ForEach-Object {
             $image = $_.Name
 
-            $TUrl = $asset.url
-            $TSha256 = $asset.sha256
+            $THasArchARM64 = ($asset.releases.arm64.url -ne $null -and $image -ne 'bullseye' -and $image -ne 'jammy' ?
+                '$true' : '$false')
+
+            $TUrlArchAMD64 = $asset.releases.amd64.url
+            $TSha256ArchAMD64 = $asset.releases.amd64.sha256
+
+            $TUrlArchARM64 = $asset.releases.arm64.url
+            $TSha256ArchARM64 = $asset.releases.arm64.sha256
+
             $TMajor = $version.Major
             $TImageVersion = $version
 
diff --git a/generated/3.0.10/bookworm/Dockerfile b/generated/3.0.10/bookworm/Dockerfile
index 1711bc2..de22ca0 100644
--- a/generated/3.0.10/bookworm/Dockerfile
+++ b/generated/3.0.10/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0}
+
 ENV FIREBIRD_VERSION=3.0.10
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.10/bullseye/Dockerfile b/generated/3.0.10/bullseye/Dockerfile
index eba582e..f971e80 100644
--- a/generated/3.0.10/bullseye/Dockerfile
+++ b/generated/3.0.10/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0}
+
 ENV FIREBIRD_VERSION=3.0.10
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.10/jammy/Dockerfile b/generated/3.0.10/jammy/Dockerfile
index 7a7d4fb..950bc56 100644
--- a/generated/3.0.10/jammy/Dockerfile
+++ b/generated/3.0.10/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.10/Firebird-3.0.10.33601-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-5e0db3b9312c5bed3eccd1855ec07df5a50176dbff35b8ebf998360b59561cf0}
+
 ENV FIREBIRD_VERSION=3.0.10
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.11/bookworm/Dockerfile b/generated/3.0.11/bookworm/Dockerfile
index c29a358..a09a179 100644
--- a/generated/3.0.11/bookworm/Dockerfile
+++ b/generated/3.0.11/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e}
+
 ENV FIREBIRD_VERSION=3.0.11
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.11/bullseye/Dockerfile b/generated/3.0.11/bullseye/Dockerfile
index be87759..52bfd39 100644
--- a/generated/3.0.11/bullseye/Dockerfile
+++ b/generated/3.0.11/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e}
+
 ENV FIREBIRD_VERSION=3.0.11
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.11/jammy/Dockerfile b/generated/3.0.11/jammy/Dockerfile
index 1800562..d1bbcdd 100644
--- a/generated/3.0.11/jammy/Dockerfile
+++ b/generated/3.0.11/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/Firebird-3.0.11.33703-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-713757e09b40b2631d800dacd9b80179b7eb75693a72089136055a7154413a3e}
+
 ENV FIREBIRD_VERSION=3.0.11
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.12/bookworm/Dockerfile b/generated/3.0.12/bookworm/Dockerfile
index 20930b7..83827da 100644
--- a/generated/3.0.12/bookworm/Dockerfile
+++ b/generated/3.0.12/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f}
+
 ENV FIREBIRD_VERSION=3.0.12
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.12/bullseye/Dockerfile b/generated/3.0.12/bullseye/Dockerfile
index e3758c3..021dbfb 100644
--- a/generated/3.0.12/bullseye/Dockerfile
+++ b/generated/3.0.12/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f}
+
 ENV FIREBIRD_VERSION=3.0.12
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.12/jammy/Dockerfile b/generated/3.0.12/jammy/Dockerfile
index fb6fd73..6a290ed 100644
--- a/generated/3.0.12/jammy/Dockerfile
+++ b/generated/3.0.12/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.12/Firebird-3.0.12.33787-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-406a8887ab318a5d8a20781fc1d38a0ca30acdbddbc1558b077646bb2e2e283f}
+
 ENV FIREBIRD_VERSION=3.0.12
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.8/bookworm/Dockerfile b/generated/3.0.8/bookworm/Dockerfile
index 0bf2c73..d796d97 100644
--- a/generated/3.0.8/bookworm/Dockerfile
+++ b/generated/3.0.8/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9}
+
 ENV FIREBIRD_VERSION=3.0.8
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.8/bullseye/Dockerfile b/generated/3.0.8/bullseye/Dockerfile
index d66d693..d33449a 100644
--- a/generated/3.0.8/bullseye/Dockerfile
+++ b/generated/3.0.8/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9}
+
 ENV FIREBIRD_VERSION=3.0.8
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.8/jammy/Dockerfile b/generated/3.0.8/jammy/Dockerfile
index e7d592e..f9918d8 100644
--- a/generated/3.0.8/jammy/Dockerfile
+++ b/generated/3.0.8/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.8/Firebird-3.0.8.33535-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-fbf154244d3568f4de4ee68769ed71a0699845197ae1c02c2029dc4d0f1af5f9}
+
 ENV FIREBIRD_VERSION=3.0.8
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.9/bookworm/Dockerfile b/generated/3.0.9/bookworm/Dockerfile
index a89a657..58acfcc 100644
--- a/generated/3.0.9/bookworm/Dockerfile
+++ b/generated/3.0.9/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4}
+
 ENV FIREBIRD_VERSION=3.0.9
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.9/bullseye/Dockerfile b/generated/3.0.9/bullseye/Dockerfile
index 1060c77..e10b921 100644
--- a/generated/3.0.9/bullseye/Dockerfile
+++ b/generated/3.0.9/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4}
+
 ENV FIREBIRD_VERSION=3.0.9
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/3.0.9/jammy/Dockerfile b/generated/3.0.9/jammy/Dockerfile
index 7534215..d763cf8 100644
--- a/generated/3.0.9/jammy/Dockerfile
+++ b/generated/3.0.9/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-0a80a5dc507f388e96adf9b64584c0b568d94a8f3df19d7baec494c5f98ba5a4}
+
 ENV FIREBIRD_VERSION=3.0.9
 ENV FIREBIRD_MAJOR=3
 
diff --git a/generated/4.0.0/bookworm/Dockerfile b/generated/4.0.0/bookworm/Dockerfile
index 862e993..24fad38 100644
--- a/generated/4.0.0/bookworm/Dockerfile
+++ b/generated/4.0.0/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e}
+
 ENV FIREBIRD_VERSION=4.0.0
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.0/bullseye/Dockerfile b/generated/4.0.0/bullseye/Dockerfile
index c8b02ab..f270a0f 100644
--- a/generated/4.0.0/bullseye/Dockerfile
+++ b/generated/4.0.0/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e}
+
 ENV FIREBIRD_VERSION=4.0.0
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.0/jammy/Dockerfile b/generated/4.0.0/jammy/Dockerfile
index c7baa64..ace8284 100644
--- a/generated/4.0.0/jammy/Dockerfile
+++ b/generated/4.0.0/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e}
+
 ENV FIREBIRD_VERSION=4.0.0
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.0/noble/Dockerfile b/generated/4.0.0/noble/Dockerfile
index b354fac..1dd8c12 100644
--- a/generated/4.0.0/noble/Dockerfile
+++ b/generated/4.0.0/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-4.0.0.2496-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-06f6e00b9657a1967f21b34bea8150d5a3e5b1d1b1313bb6455e16878b42d63e}
+
 ENV FIREBIRD_VERSION=4.0.0
 ENV FIREBIRD_MAJOR=4
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/4.0.1/bookworm/Dockerfile b/generated/4.0.1/bookworm/Dockerfile
index 0d4f1a9..1ccc011 100644
--- a/generated/4.0.1/bookworm/Dockerfile
+++ b/generated/4.0.1/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998}
+
 ENV FIREBIRD_VERSION=4.0.1
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.1/bullseye/Dockerfile b/generated/4.0.1/bullseye/Dockerfile
index cee29c5..835596d 100644
--- a/generated/4.0.1/bullseye/Dockerfile
+++ b/generated/4.0.1/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998}
+
 ENV FIREBIRD_VERSION=4.0.1
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.1/jammy/Dockerfile b/generated/4.0.1/jammy/Dockerfile
index f0fa0a7..133b786 100644
--- a/generated/4.0.1/jammy/Dockerfile
+++ b/generated/4.0.1/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998}
+
 ENV FIREBIRD_VERSION=4.0.1
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.1/noble/Dockerfile b/generated/4.0.1/noble/Dockerfile
index 707399b..54b2172 100644
--- a/generated/4.0.1/noble/Dockerfile
+++ b/generated/4.0.1/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.1/Firebird-4.0.1.2692-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-90b6727b8366b3674fc30ba13d0f52ab0b419c3bb3a4224c8d3f480143538998}
+
 ENV FIREBIRD_VERSION=4.0.1
 ENV FIREBIRD_MAJOR=4
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/4.0.2/bookworm/Dockerfile b/generated/4.0.2/bookworm/Dockerfile
index e95a437..4659c97 100644
--- a/generated/4.0.2/bookworm/Dockerfile
+++ b/generated/4.0.2/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa}
+
 ENV FIREBIRD_VERSION=4.0.2
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.2/bullseye/Dockerfile b/generated/4.0.2/bullseye/Dockerfile
index 82007d4..9920adc 100644
--- a/generated/4.0.2/bullseye/Dockerfile
+++ b/generated/4.0.2/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa}
+
 ENV FIREBIRD_VERSION=4.0.2
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.2/jammy/Dockerfile b/generated/4.0.2/jammy/Dockerfile
index e305b35..1713a2f 100644
--- a/generated/4.0.2/jammy/Dockerfile
+++ b/generated/4.0.2/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa}
+
 ENV FIREBIRD_VERSION=4.0.2
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.2/noble/Dockerfile b/generated/4.0.2/noble/Dockerfile
index 0c32c82..4ccfd65 100644
--- a/generated/4.0.2/noble/Dockerfile
+++ b/generated/4.0.2/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-70108f9854a522ac6eb7b2bdc1bda9780aab97dbfbf358ced90c0db13b8af9fa}
+
 ENV FIREBIRD_VERSION=4.0.2
 ENV FIREBIRD_MAJOR=4
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/4.0.3/bookworm/Dockerfile b/generated/4.0.3/bookworm/Dockerfile
index e0e1813..0ad92f0 100644
--- a/generated/4.0.3/bookworm/Dockerfile
+++ b/generated/4.0.3/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d}
+
 ENV FIREBIRD_VERSION=4.0.3
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.3/bullseye/Dockerfile b/generated/4.0.3/bullseye/Dockerfile
index e787ebc..5653a4b 100644
--- a/generated/4.0.3/bullseye/Dockerfile
+++ b/generated/4.0.3/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d}
+
 ENV FIREBIRD_VERSION=4.0.3
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.3/jammy/Dockerfile b/generated/4.0.3/jammy/Dockerfile
index 75d25fc..95e7c6f 100644
--- a/generated/4.0.3/jammy/Dockerfile
+++ b/generated/4.0.3/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d}
+
 ENV FIREBIRD_VERSION=4.0.3
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.3/noble/Dockerfile b/generated/4.0.3/noble/Dockerfile
index 92b28ae..a47f6e5 100644
--- a/generated/4.0.3/noble/Dockerfile
+++ b/generated/4.0.3/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.3/Firebird-4.0.3.2975-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-bd439c3c8f74fd03a592eafd20de37ce028c424fbe023352f1bd17db54c3257d}
+
 ENV FIREBIRD_VERSION=4.0.3
 ENV FIREBIRD_MAJOR=4
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/4.0.4/bookworm/Dockerfile b/generated/4.0.4/bookworm/Dockerfile
index e06327a..830099f 100644
--- a/generated/4.0.4/bookworm/Dockerfile
+++ b/generated/4.0.4/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca}
+
 ENV FIREBIRD_VERSION=4.0.4
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.4/bullseye/Dockerfile b/generated/4.0.4/bullseye/Dockerfile
index 51db23f..2752ffc 100644
--- a/generated/4.0.4/bullseye/Dockerfile
+++ b/generated/4.0.4/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca}
+
 ENV FIREBIRD_VERSION=4.0.4
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.4/jammy/Dockerfile b/generated/4.0.4/jammy/Dockerfile
index 87aac25..99fd8f7 100644
--- a/generated/4.0.4/jammy/Dockerfile
+++ b/generated/4.0.4/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca}
+
 ENV FIREBIRD_VERSION=4.0.4
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.4/noble/Dockerfile b/generated/4.0.4/noble/Dockerfile
index 8d18488..6cf5c4a 100644
--- a/generated/4.0.4/noble/Dockerfile
+++ b/generated/4.0.4/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-ef589301c5e13a1f8481e1e38c453641ef5082344bf69edb51f8aa9f036bcaca}
+
 ENV FIREBIRD_VERSION=4.0.4
 ENV FIREBIRD_MAJOR=4
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/4.0.5/bookworm/Dockerfile b/generated/4.0.5/bookworm/Dockerfile
index 2dc5074..24300bd 100644
--- a/generated/4.0.5/bookworm/Dockerfile
+++ b/generated/4.0.5/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6}
+
 ENV FIREBIRD_VERSION=4.0.5
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.5/bullseye/Dockerfile b/generated/4.0.5/bullseye/Dockerfile
index 7002bde..3e2e4fc 100644
--- a/generated/4.0.5/bullseye/Dockerfile
+++ b/generated/4.0.5/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6}
+
 ENV FIREBIRD_VERSION=4.0.5
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.5/jammy/Dockerfile b/generated/4.0.5/jammy/Dockerfile
index 01ad59e..910b8e5 100644
--- a/generated/4.0.5/jammy/Dockerfile
+++ b/generated/4.0.5/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6}
+
 ENV FIREBIRD_VERSION=4.0.5
 ENV FIREBIRD_MAJOR=4
 
diff --git a/generated/4.0.5/noble/Dockerfile b/generated/4.0.5/noble/Dockerfile
index b7e014b..96e0dd7 100644
--- a/generated/4.0.5/noble/Dockerfile
+++ b/generated/4.0.5/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/Firebird-4.0.5.3140-0.amd64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-6ae43e4fa31ddc99220575023b7d954fb218c063375bb589b16fbe9fcdfdcaa6}
+
 ENV FIREBIRD_VERSION=4.0.5
 ENV FIREBIRD_MAJOR=4
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/5.0.0/bookworm/Dockerfile b/generated/5.0.0/bookworm/Dockerfile
index 58d0aa3..435b775 100644
--- a/generated/5.0.0/bookworm/Dockerfile
+++ b/generated/5.0.0/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+bdb62abc91a4c26a86b9377256529622e3046f4ec4f66fbdcf46747688d45033}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768}
+
 ENV FIREBIRD_VERSION=5.0.0
 ENV FIREBIRD_MAJOR=5
 
diff --git a/generated/5.0.0/bullseye/Dockerfile b/generated/5.0.0/bullseye/Dockerfile
index 7750fcd..31aa6c7 100644
--- a/generated/5.0.0/bullseye/Dockerfile
+++ b/generated/5.0.0/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+bdb62abc91a4c26a86b9377256529622e3046f4ec4f66fbdcf46747688d45033}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768}
+
 ENV FIREBIRD_VERSION=5.0.0
 ENV FIREBIRD_MAJOR=5
 
diff --git a/generated/5.0.0/jammy/Dockerfile b/generated/5.0.0/jammy/Dockerfile
index 2a8b56d..3a313d1 100644
--- a/generated/5.0.0/jammy/Dockerfile
+++ b/generated/5.0.0/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+bdb62abc91a4c26a86b9377256529622e3046f4ec4f66fbdcf46747688d45033}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768}
+
 ENV FIREBIRD_VERSION=5.0.0
 ENV FIREBIRD_MAJOR=5
 
diff --git a/generated/5.0.0/noble/Dockerfile b/generated/5.0.0/noble/Dockerfile
index 67a800e..4205c8c 100644
--- a/generated/5.0.0/noble/Dockerfile
+++ b/generated/5.0.0/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+bdb62abc91a4c26a86b9377256529622e3046f4ec4f66fbdcf46747688d45033}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-137b356ea464e224b6ed1241e6dba95b6b950ff1feef91696d4071d4da880768}
+
 ENV FIREBIRD_VERSION=5.0.0
 ENV FIREBIRD_MAJOR=5
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/generated/5.0.1/bookworm/Dockerfile b/generated/5.0.1/bookworm/Dockerfile
index 1154d1b..2eb4bb4 100644
--- a/generated/5.0.1/bookworm/Dockerfile
+++ b/generated/5.0.1/bookworm/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+46b3f4f170458a93365c67118c062ba8509903fe8293bf8a62e7bd8a388e2d06}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57}
+
 ENV FIREBIRD_VERSION=5.0.1
 ENV FIREBIRD_MAJOR=5
 
diff --git a/generated/5.0.1/bullseye/Dockerfile b/generated/5.0.1/bullseye/Dockerfile
index 2d8aff2..d2719b5 100644
--- a/generated/5.0.1/bullseye/Dockerfile
+++ b/generated/5.0.1/bullseye/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+46b3f4f170458a93365c67118c062ba8509903fe8293bf8a62e7bd8a388e2d06}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57}
+
 ENV FIREBIRD_VERSION=5.0.1
 ENV FIREBIRD_MAJOR=5
 
diff --git a/generated/5.0.1/jammy/Dockerfile b/generated/5.0.1/jammy/Dockerfile
index a12a840..389904c 100644
--- a/generated/5.0.1/jammy/Dockerfile
+++ b/generated/5.0.1/jammy/Dockerfile
@@ -7,8 +7,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+46b3f4f170458a93365c67118c062ba8509903fe8293bf8a62e7bd8a388e2d06}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57}
+
 ENV FIREBIRD_VERSION=5.0.1
 ENV FIREBIRD_MAJOR=5
 
diff --git a/generated/5.0.1/noble/Dockerfile b/generated/5.0.1/noble/Dockerfile
index aac302d..9417794 100644
--- a/generated/5.0.1/noble/Dockerfile
+++ b/generated/5.0.1/noble/Dockerfile
@@ -2,13 +2,18 @@
 # This file was auto-generated. Do not edit. See /src.
 #
 
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz
-ENV FIREBIRD_RELEASE_SHA256=e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-arm64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+46b3f4f170458a93365c67118c062ba8509903fe8293bf8a62e7bd8a388e2d06}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-https://github.com/FirebirdSQL/firebird/releases/download/v5.0.1/Firebird-5.0.1.1469-0-linux-x64.tar.gz}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-e1023b005e5d6db8f717af032e91f0f94aa7a8dbe0e78f250931214ca0a21e57}
+
 ENV FIREBIRD_VERSION=5.0.1
 ENV FIREBIRD_MAJOR=5
 
@@ -59,7 +64,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/src/Dockerfile.bookworm.template b/src/Dockerfile.bookworm.template
index a4ee684..4a23242 100644
--- a/src/Dockerfile.bookworm.template
+++ b/src/Dockerfile.bookworm.template
@@ -3,8 +3,16 @@
 
 FROM debian:bookworm-slim
 
-ENV FIREBIRD_RELEASE_URL=<%$TUrl%>
-ENV FIREBIRD_RELEASE_SHA256=<%$TSha256%>
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+<%$TUrlArchARM64%>}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+<%$TSha256ArchARM64%>}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-<%$TUrlArchAMD64%>}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-<%$TSha256ArchAMD64%>}
+
 ENV FIREBIRD_VERSION=<%$TImageVersion%>
 ENV FIREBIRD_MAJOR=<%$TMajor%>
 
diff --git a/src/Dockerfile.bullseye.template b/src/Dockerfile.bullseye.template
index 752726d..51c4a71 100644
--- a/src/Dockerfile.bullseye.template
+++ b/src/Dockerfile.bullseye.template
@@ -3,8 +3,16 @@
 
 FROM debian:bullseye-slim
 
-ENV FIREBIRD_RELEASE_URL=<%$TUrl%>
-ENV FIREBIRD_RELEASE_SHA256=<%$TSha256%>
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+<%$TUrlArchARM64%>}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+<%$TSha256ArchARM64%>}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-<%$TUrlArchAMD64%>}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-<%$TSha256ArchAMD64%>}
+
 ENV FIREBIRD_VERSION=<%$TImageVersion%>
 ENV FIREBIRD_MAJOR=<%$TMajor%>
 
diff --git a/src/Dockerfile.jammy.template b/src/Dockerfile.jammy.template
index 10e9216..dcf2587 100644
--- a/src/Dockerfile.jammy.template
+++ b/src/Dockerfile.jammy.template
@@ -3,8 +3,16 @@
 
 FROM ubuntu:jammy
 
-ENV FIREBIRD_RELEASE_URL=<%$TUrl%>
-ENV FIREBIRD_RELEASE_SHA256=<%$TSha256%>
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+<%$TUrlArchARM64%>}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+<%$TSha256ArchARM64%>}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-<%$TUrlArchAMD64%>}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-<%$TSha256ArchAMD64%>}
+
 ENV FIREBIRD_VERSION=<%$TImageVersion%>
 ENV FIREBIRD_MAJOR=<%$TMajor%>
 
diff --git a/src/Dockerfile.noble.template b/src/Dockerfile.noble.template
index 621280e..da7473f 100644
--- a/src/Dockerfile.noble.template
+++ b/src/Dockerfile.noble.template
@@ -1,10 +1,15 @@
-# Best practices for Dockerfile instructions
-#   https://docs.docker.com/develop/develop-images/instructions/
-
 FROM ubuntu:noble
 
-ENV FIREBIRD_RELEASE_URL=<%$TUrl%>
-ENV FIREBIRD_RELEASE_SHA256=<%$TSha256%>
+ARG ARCH_ARM64
+
+# ARM64 arch
+ENV FIREBIRD_RELEASE_URL=${ARCH_ARM64:+<%$TUrlArchARM64%>}
+ENV FIREBIRD_RELEASE_SHA256=${ARCH_ARM64:+<%$TSha256ArchARM64%>}
+
+# AMD64 arch
+ENV FIREBIRD_RELEASE_URL=${FIREBIRD_RELEASE_URL:-<%$TUrlArchAMD64%>}
+ENV FIREBIRD_RELEASE_SHA256=${FIREBIRD_RELEASE_SHA256:-<%$TSha256ArchAMD64%>}
+
 ENV FIREBIRD_VERSION=<%$TImageVersion%>
 ENV FIREBIRD_MAJOR=<%$TMajor%>
 
@@ -55,7 +60,7 @@ RUN set -eux; \
 ENV PATH=/opt/firebird/bin:$PATH
 
 # Data directory
-ENV FIREBIRD_DATA /var/lib/firebird/data
+ENV FIREBIRD_DATA=/var/lib/firebird/data
 RUN set -eux; \
     mkdir -p "$FIREBIRD_DATA"; \
     chown -R firebird:firebird "$FIREBIRD_DATA"; \
diff --git a/src/image.build.ps1.template b/src/image.build.ps1.template
index 3640552..06cd525 100644
--- a/src/image.build.ps1.template
+++ b/src/image.build.ps1.template
@@ -2,21 +2,23 @@ param(
     [switch]$NoCache
 )
 
-# Synopsis: Build docker image.
+# Synopsis: Build docker images.
 task Build {
+    $script:BUILDER_HAS_ARCH_ARM64 = <%$THasArchARM64%>
     $script:BUILDER_IMAGE_PREFIX = 'firebirdsql'
     $script:BUILDER_IMAGE_NAME = 'firebird'
     $script:BUILDER_IMAGE_VERSION = '<%$TImageVersion%>'
     $script:BUILDER_IMAGE_TAGS = @(<%$TImageTags%>)
 
-    $env:FULL_IMAGE_NAME = "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$BUILDER_IMAGE_VERSION"
-
     $noCacheParameter = if ($NoCache) { '--no-cache' } else { $null }
-    $tags = $BUILDER_IMAGE_TAGS | ForEach-Object { '--tag', "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_" }
+
+    $tagsArchAMD64 = $BUILDER_IMAGE_TAGS | ForEach-Object { '--tag', "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-amd64:$_" }
+    $tagsArchARM64 = $BUILDER_IMAGE_TAGS | ForEach-Object { '--tag', "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-arm64:$_" }
 
     $allParameters = @(
         'build';
-        $tags;
+        '--platform', 'linux/amd64';
+        $tagsArchAMD64;
         $noCacheParameter,
         '--label', 'org.opencontainers.image.description=Firebird Database',
         '--label', 'org.opencontainers.image.source=https://github.com/FirebirdSQL/firebird-docker',
@@ -25,12 +27,36 @@ task Build {
     )
     Write-Verbose "docker $allParameters"
     exec { & docker $allParameters }
+
+    if ($BUILDER_HAS_ARCH_ARM64) {
+        $allParameters = @(
+            'build';
+            '--platform', 'linux/arm64';
+            '--build-arg', 'ARCH_ARM64=1';
+            $tagsArchARM64;
+            $noCacheParameter,
+            '--label', 'org.opencontainers.image.description=Firebird Database',
+            '--label', 'org.opencontainers.image.source=https://github.com/FirebirdSQL/firebird-docker',
+            '--label', 'org.opencontainers.image.version=<%$TImageVersion%>',
+            '.'
+        )
+        Write-Verbose "docker $allParameters"
+        exec { & docker $allParameters }
+	}
 }
 
 # Synopsis: Run tests.
 task Test Build, {
     Write-Build Magenta "----- [$BUILDER_IMAGE_VERSION] ---------------------"
+    $tag = $BUILDER_IMAGE_TAGS[0]
+
+    $env:FULL_IMAGE_NAME = "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-amd64:${tag}"
     Invoke-Build * image.tests.ps1
+
+    if ($BUILDER_HAS_ARCH_ARM64) {
+        $env:FULL_IMAGE_NAME = "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-arm64:${tag}"
+        Invoke-Build * image.tests.ps1
+    }
 }
 
 # Synopsis: Publish image.
@@ -38,6 +64,27 @@ task Publish Build, {
     Write-Build Magenta "----- [$BUILDER_IMAGE_VERSION] ---------------------"
 
     $BUILDER_IMAGE_TAGS | ForEach-Object {
-        docker push "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_"
+        docker push "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-amd64:$_"
+
+        if ($BUILDER_HAS_ARCH_ARM64) {
+            docker push "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-arm64:$_"
+
+            docker manifest create --amend "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_" `
+                "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-amd64:$_" `
+                "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-arm64:$_"
+
+            docker manifest annotate "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_" `
+                "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-amd64:$_" --os linux --arch amd64
+            docker manifest annotate "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_" `
+                "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-arm64:$_" --os linux --arch arm64
+
+            docker manifest push "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_"
+        }
+        else {
+            docker image tag "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}-amd64:$_" `
+                "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_"
+
+            docker push "$BUILDER_IMAGE_PREFIX/${BUILDER_IMAGE_NAME}:$_"
+        }
     }
 }
diff --git a/src/image.tests.ps1 b/src/image.tests.ps1
index b9f3c85..1a94bc8 100644
--- a/src/image.tests.ps1
+++ b/src/image.tests.ps1
@@ -56,7 +56,7 @@ function Wait-Port([string]$ContainerName, [int]$Port) {
 # Test if a port is open in a container.
 function Test-Port([string]$ContainerName, [int]$Port) {
     $command = "cat < /dev/null > /dev/tcp/localhost/$Port"
-    docker exec $ContainerName bash -c $command -ErrorAction SilentlyContinue
+    docker exec $ContainerName bash -c $command -ErrorAction SilentlyContinue *>&1 | Out-Null
     return ($LASTEXITCODE -eq 0)
 }