diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4166c307a56..711cd674450 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,9 +28,12 @@ jobs:
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev
     with:
-      build_id: dspace-angular
+      build_id: dspace-angular-dev
       image_name: dataquest/dspace-angular
       dockerfile_path: ./Dockerfile
+      tags_flavor: suffix=-dev
+      # As this is a "dev" image, its tags are all suffixed with "-dev". Otherwise, it uses the same
+      # tagging logic as the primary 'dspace/dspace-angular' image above.
       run_python_version_script: true
       python_version_script_dest: src/static-files/VERSION_D.html
     secrets:
@@ -42,16 +45,13 @@ jobs:
   #############################################################
   dspace-angular-dist:
     # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular'
-    if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now
+    if: github.repository == 'dataquest-dev/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev
     with:
-      build_id: dspace-angular-dist
-      image_name: dspace/dspace-angular
+      build_id: dspace-angular
+      image_name: dataquest/dspace-angular
       dockerfile_path: ./Dockerfile.dist
-      # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-      # tagging logic as the primary 'dspace/dspace-angular' image above.
-      tags_flavor: suffix=-dist
       run_python_version_script: true
       python_version_script_dest: src/static-files/VERSION_D.html
     secrets:
diff --git a/Dockerfile.dist b/Dockerfile.dist
index 26c8bf6d6ab..4c1fc659f4d 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -15,6 +15,9 @@ COPY package.json yarn.lock ./
 RUN yarn install --network-timeout 300000
 
 ADD . /app/
+
+# Set memory limit for build process - Angular builds require more memory
+ENV NODE_OPTIONS="--max_old_space_size=4096"
 RUN yarn build:prod
 
 FROM node:18-alpine