diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 811f71a04..221d4eb1d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -28,17 +28,15 @@ Briefly describe the problem you are having in a few paragraphs.
 
 **Steps to reproduce the issue:**
 
-1.
-2.
-3.
+1. 2. 3.
 
 Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
 
 **Technical details:**
 
-* Portainer version:
-* Target Docker version (the host/cluster you manage):
-* Platform (windows/linux):
-* Command used to start Portainer (`docker run -p 9000:9000 portainer/portainer`):
-* Target Swarm version (if applicable):
-* Browser:
+- Portainer version:
+- Target Docker version (the host/cluster you manage):
+- Platform (windows/linux):
+- Command used to start Portainer (`docker run -p 9443:9443 portainer/portainer`):
+- Target Swarm version (if applicable):
+- Browser:
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 52a031d48..1d950b9ac 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -4,7 +4,6 @@ about: Create a bug report
 title: ''
 labels: bug/need-confirmation, kind/bug
 assignees: ''
-
 ---
 
 <!--
@@ -46,7 +45,7 @@ You can see how [here](https://documentation.portainer.io/archive/1.23.2/faq/#ho
 - Docker version (managed by Portainer):
 - Kubernetes version (managed by Portainer):
 - Platform (windows/linux):
-- Command used to start Portainer (`docker run -p 9000:9000 portainer/portainer`):
+- Command used to start Portainer (`docker run -p 9443:9443 portainer/portainer`):
 - Browser:
 - Use Case (delete as appropriate): Using Portainer at Home, Using Portainer in a Commerical setup.
 - Have you reviewed our technical documentation and knowledge base? Yes/No
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a9e336cf..8ef15bb22 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,7 +91,7 @@ Then build and run the project:
 $ yarn start
 ```
 
-Portainer can now be accessed at <http://localhost:9000>.
+Portainer can now be accessed at <https://localhost:9443>.
 
 Find more detailed steps at <https://documentation.portainer.io/contributing/instructions/>.
 
diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html
index a3c32cab8..8029aea7f 100644
--- a/app/portainer/views/endpoints/create/createendpoint.html
+++ b/app/portainer/views/endpoints/create/createendpoint.html
@@ -130,8 +130,8 @@
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 <p>
-                  Allows you to create an environment that can be registered with an Edge agent. The Edge agent will initiate the communications with the Portainer instance. All the
-                  required information on how to connect an Edge agent to this environment will be available after environment creation.
+                  Allows you to create an environment that can be registered with an Edge agent. The Edge agent will initiate the communications with the Portainer instance. All
+                  the required information on how to connect an Edge agent to this environment will be available after environment creation.
                 </p>
                 <p> You can read more about the Edge agent in the userguide available <a href="https://downloads.portainer.io/edge_agent_guide.pdf">here.</a> </p>
               </span>
@@ -309,7 +309,7 @@
                   class="form-control"
                   name="endpoint_url"
                   ng-model="formValues.URL"
-                  placeholder="e.g. 10.0.0.10:9000 or portainer.mydomain.com"
+                  placeholder="e.g. 10.0.0.10:9443 or portainer.mydomain.com"
                   required
                   data-cy="endpointCreate-portainerServerUrlInput"
                 />
diff --git a/build/linux/Dockerfile b/build/linux/Dockerfile
index 7427e5f5b..c07dc6d29 100644
--- a/build/linux/Dockerfile
+++ b/build/linux/Dockerfile
@@ -6,6 +6,7 @@ VOLUME /data
 WORKDIR /
 
 EXPOSE 9000
+EXPOSE 9443
 EXPOSE 8000
 
 ENTRYPOINT ["/portainer"]
diff --git a/build/linux/alpine.Dockerfile b/build/linux/alpine.Dockerfile
index 3825fb13f..6108c4c56 100644
--- a/build/linux/alpine.Dockerfile
+++ b/build/linux/alpine.Dockerfile
@@ -6,6 +6,7 @@ VOLUME /data
 WORKDIR /
 
 EXPOSE 9000
+EXPOSE 9443
 EXPOSE 8000
 
 ENTRYPOINT ["/portainer"]
diff --git a/build/linux/dev-toolkit/toolkit.Dockerfile b/build/linux/dev-toolkit/toolkit.Dockerfile
index 32470cc3b..a3a189f0a 100644
--- a/build/linux/dev-toolkit/toolkit.Dockerfile
+++ b/build/linux/dev-toolkit/toolkit.Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:20.04
 
 # Expose port for the Portainer UI and Edge server
 EXPOSE 9000
+EXPOSE 9443
 EXPOSE 8000
 
 WORKDIR /src/portainer
diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index 16951f065..1e788a2b0 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -19,6 +19,7 @@ USER ContainerAdministrator
 COPY dist /
 
 EXPOSE 9000
+EXPOSE 9443
 EXPOSE 8000
 
 ENTRYPOINT ["/portainer.exe"]
diff --git a/test/e2e/cypress.json b/test/e2e/cypress.json
index 0d105169b..5e9c0cbe7 100644
--- a/test/e2e/cypress.json
+++ b/test/e2e/cypress.json
@@ -1,6 +1,6 @@
 {
   "projectId": "cgz5j5",
-  "baseUrl": "http://localhost:9000",
+  "baseUrl": "https://localhost:9443",
   "video": false,
   "experimentalNetworkStubbing": true
 }
diff --git a/test/unit/app/components/startContainerController.spec.js b/test/unit/app/components/startContainerController.spec.js
index e2cc0c2b3..f874b5cbe 100644
--- a/test/unit/app/components/startContainerController.spec.js
+++ b/test/unit/app/components/startContainerController.spec.js
@@ -29,8 +29,8 @@ describe('startContainerController', function () {
         Ports: [
           {
             IP: '0.0.0.0',
-            PrivatePort: 9000,
-            PublicPort: 9000,
+            PrivatePort: 9443,
+            PublicPort: 9443,
             Type: 'tcp',
           },
         ],
@@ -46,11 +46,11 @@ describe('startContainerController', function () {
       var expectedBody = {
         name: 'container-name',
         ExposedPorts: {
-          '9000/tcp': {},
+          '9443/tcp': {},
         },
         HostConfig: {
           PortBindings: {
-            '9000/tcp': [
+            '9443/tcp': [
               {
                 HostPort: '9999',
                 HostIp: '10.20.10.15',
@@ -76,7 +76,7 @@ describe('startContainerController', function () {
         {
           ip: '10.20.10.15',
           extPort: '9999',
-          intPort: '9000',
+          intPort: '9443',
         },
       ];
 
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index f92df4043..3f5ef7106 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -70,7 +70,7 @@ module.exports = {
     compress: true,
     port: 8999,
     proxy: {
-      '/api': 'http://localhost:9000',
+      '/api': 'https://localhost:9443',
     },
     open: true,
     writeToDisk: true,