diff --git a/Dockerfile b/Dockerfile
index db9983cacedbb584db76a0a7ea9cfb900f81d2b7..9bda529ddfe35ae615295be28e830981f873f90e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 FROM node:12-alpine
 WORKDIR /app
 ADD . /app/
-EXPOSE 4000
+EXPOSE 3000
 
 # We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
 # See, for example https://github.com/yarnpkg/yarn/issues/5540
diff --git a/angular.json b/angular.json
index b3fbd82f0222aaa7f83a3b75d0456c8ddc1a5442..b63d82fd4b21aef0325de18bbf84ff3b02093d03 100644
--- a/angular.json
+++ b/angular.json
@@ -66,7 +66,7 @@
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "browserTarget": "dspace-angular-cli:build",
-            "port": 4000
+            "port": 3000
           },
           "configurations": {
             "production": {
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 87f2fe0a5c8ee11363fd245f26a173f60e72b3ce..23f0615a1f263639ad85790c87582b113ca3ef1f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     environment:
       DSPACE_HOST: dspace-angular
       DSPACE_NAMESPACE: /
-      DSPACE_PORT: '4000'
+      DSPACE_PORT: '3000'
       DSPACE_SSL: "false"
     image: dspace/dspace-angular:latest
     build:
@@ -16,8 +16,8 @@ services:
     networks:
       dspacenet:
     ports:
-    - published: 4000
-      target: 4000
+    - published: 3000
+      target: 3000
     - published: 9876
       target: 9876
     stdin_open: true
diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
index 51180c8044634beee55376af64e3fc71a01a8348..2432b989097a7806af720ceb1fb211ccdb4309c4 100644
--- a/e2e/protractor.conf.js
+++ b/e2e/protractor.conf.js
@@ -12,7 +12,7 @@ exports.config = {
   // Change to 'false' to run tests using a remote Selenium server
   directConnect: true,
   // Change if the website to test is not on the localhost
-  baseUrl: 'http://localhost:4000/',
+  baseUrl: 'http://localhost:3000/',
   // -----------------------------------------------------------------
   specs: [
     './src/**/*.e2e-spec.ts'
diff --git a/server.ts b/server.ts
index ffa528ea3e4921ce5fe0914204a634ede79dd282..442bb1988568d430b286e386958069fd420c18d6 100644
--- a/server.ts
+++ b/server.ts
@@ -27,7 +27,7 @@ import * as cookieParser from 'cookie-parser';
 // Express server
 const app = express();
 
-const PORT = process.env.PORT || 4000;
+const PORT = process.env.PORT || 3000;
 const DIST_FOLDER = join(process.cwd(), 'dist/browser');
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 9dcac653634ff6d52b372b81f6e9ba5c8f7ae5e8..62b988e0fcc26bac8d9fa3fb936acbcee665fe41 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -9,7 +9,7 @@ export const environment: GlobalConfig = {
   ui: {
     ssl: false,
     host: 'localhost',
-    port: 4000,
+    port: 3000,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/',
   },