diff --git a/CHANGELOG.md b/CHANGELOG.md
index a99e350..cc8406a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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).
 
+## [2.0.36] - 2023-08-02
+### Changed
+- Fixed docker build process and upgraded to Node18.
+
 ## [2.0.35] - 2023-08-02
 ### Removed
 - Docker arm32/v7 images because the base image does not support it anymore: https://www.linuxserver.io/blog/a-farewell-to-arm-hf
diff --git a/Dockerfile b/Dockerfile
index 80b6daa..60d217f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1 - Build the frontend
-FROM node:16-alpine3.18 AS node-build-env
+FROM node:18-alpine3.18 AS node-build-env
 ARG TARGETPLATFORM
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 ARG BUILDPLATFORM
@@ -8,7 +8,7 @@ ENV BUILDPLATFORM=${BUILDPLATFORM:-linux/amd64}
 RUN mkdir /appclient
 WORKDIR /appclient
 
-RUN apk add --no-cache git
+RUN apk add --no-cache git python3 py3-pip make g++
 
 RUN \
    echo "**** Cloning Source Code ****" && \
diff --git a/client/src/app/navbar/navbar.component.html b/client/src/app/navbar/navbar.component.html
index 573c77e..939c0b8 100644
--- a/client/src/app/navbar/navbar.component.html
+++ b/client/src/app/navbar/navbar.component.html
@@ -55,7 +55,7 @@
           <a class="navbar-item" routerLink="profile"> Profile </a>
           <a class="navbar-item" (click)="logout()"> Logout </a>
           <hr class="navbar-divider" />
-          <a href="https://github.com/rogerfar/rdt-client" target="_blank" class="navbar-item">Version 2.0.35</a>
+          <a href="https://github.com/rogerfar/rdt-client" target="_blank" class="navbar-item">Version 2.0.36</a>
         </div>
       </div>
     </div>
diff --git a/docker-publish.ps1 b/docker-publish.ps1
index a98e347..49a30d9 100755
--- a/docker-publish.ps1
+++ b/docker-publish.ps1
@@ -13,7 +13,7 @@
         The docker account to use to push the image
 
         .PARAMETER Platforms
-        The platforms to target for the image (defaults to linux/arm/v7,linux/arm64/v8,linux/amd64)
+        The platforms to target for the image (defaults to linux/arm64/v8,linux/amd64)
 
         .INPUTS
         None. You cannot pipe objects to to this script.
diff --git a/package.json b/package.json
index 4b36e98..99dea26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rdt-client",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "This is a web interface to manage your torrents on Real-Debrid.",
   "main": "index.js",
   "dependencies": {
diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj
index 9dc172c..7c94a0e 100644
--- a/server/RdtClient.Web/RdtClient.Web.csproj
+++ b/server/RdtClient.Web/RdtClient.Web.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <UserSecretsId>94c24cba-f03f-4453-a671-3640b517c573</UserSecretsId>
-    <Version>2.0.35</Version>
+    <Version>2.0.36</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>