diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index fc8d60b7824028c04c04a71af14141e1a68cec8f..dced527ed60ef34ea34dbb16ccd872f4e53e4a87 100644
--- a/10/mysql-tomcat/Dockerfile
+++ b/10/mysql-tomcat/Dockerfile
@@ -45,7 +45,7 @@ RUN apt-get update && \
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=10.11.7
-ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
+ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
 ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/10/mysql-tomcat/tomcat/setenv.sh b/10/mysql-tomcat/tomcat/setenv.sh
index 7217ccc28037ff5aba6a13d42865be64bfdbc946..755f260ef22e6b02f80c92ae6a07d47610cec7b4 100755
--- a/10/mysql-tomcat/tomcat/setenv.sh
+++ b/10/mysql-tomcat/tomcat/setenv.sh
@@ -22,7 +22,7 @@
 # We're making the following changes to the default:
 # * Adding more memory (default is 512MB which is not enough for XWiki)
 # * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
-#   http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
+#   https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
 #   be able to have '/' and '' in wiki page names.
 # * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
 
diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
index 3a4f3a76d07ed164b56ed4b6f8b435a3a50c36e6..e2cc2bedac529469a97512c28d007917015acf48 100644
--- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
     <property name="jdbc.use_scrollable_resultset">false</property>
 
     <!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
-         at http://commons.apache.org/proper/commons-dbcp/configuration.html
+         at https://commons.apache.org/proper/commons-dbcp/configuration.html
     -->
     <property name="dbcp.defaultAutoCommit">false</property>
     <property name="dbcp.maxTotal">50</property>
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 98d1625e45991b9bfb9689f3b88a2a293490885c..9eb81f52dd98efb8331024c3b1208355f97b4772 100644
--- a/10/postgres-tomcat/Dockerfile
+++ b/10/postgres-tomcat/Dockerfile
@@ -45,7 +45,7 @@ RUN apt-get update && \
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=10.11.7
-ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
+ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
 ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/10/postgres-tomcat/tomcat/setenv.sh b/10/postgres-tomcat/tomcat/setenv.sh
index 7217ccc28037ff5aba6a13d42865be64bfdbc946..755f260ef22e6b02f80c92ae6a07d47610cec7b4 100755
--- a/10/postgres-tomcat/tomcat/setenv.sh
+++ b/10/postgres-tomcat/tomcat/setenv.sh
@@ -22,7 +22,7 @@
 # We're making the following changes to the default:
 # * Adding more memory (default is 512MB which is not enough for XWiki)
 # * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
-#   http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
+#   https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
 #   be able to have '/' and '' in wiki page names.
 # * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
 
diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
index 5ecafb4d25934fd80a73ea0ac3c26dc17470f8f4..d050dfdfb832a9535fc2666c501074e51c994d2b 100644
--- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
     <property name="jdbc.use_scrollable_resultset">false</property>
 
     <!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
-         at http://commons.apache.org/proper/commons-dbcp/configuration.html
+         at https://commons.apache.org/proper/commons-dbcp/configuration.html
     -->
     <property name="dbcp.defaultAutoCommit">false</property>
     <property name="dbcp.maxTotal">50</property>
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index 67e0a16d752be6a80e10a54ebc1f47b32804ca58..e8d69b97b2a152b68ab1bf9b81beafcf70a24f56 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/mysql-tomcat/Dockerfile
@@ -45,7 +45,7 @@ RUN apt-get update && \
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=11.2
-ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
+ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
 ENV XWIKI_DOWNLOAD_SHA256 8dcdbc3ea28d8929f881c83544409faafbe4e0f462322e6386b6d2ff53f12bfa
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/11/mysql-tomcat/tomcat/setenv.sh b/11/mysql-tomcat/tomcat/setenv.sh
index 7217ccc28037ff5aba6a13d42865be64bfdbc946..755f260ef22e6b02f80c92ae6a07d47610cec7b4 100755
--- a/11/mysql-tomcat/tomcat/setenv.sh
+++ b/11/mysql-tomcat/tomcat/setenv.sh
@@ -22,7 +22,7 @@
 # We're making the following changes to the default:
 # * Adding more memory (default is 512MB which is not enough for XWiki)
 # * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
-#   http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
+#   https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
 #   be able to have '/' and '' in wiki page names.
 # * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
 
diff --git a/11/mysql-tomcat/xwiki/hibernate.cfg.xml b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
index 68de272f9b00f4615b0bd7213bf73951e3ac073c..3dd16ad9845681a6aa71a030fc9fe0f0382603ac 100644
--- a/11/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
     <property name="jdbc.use_scrollable_resultset">false</property>
 
     <!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
-         at http://commons.apache.org/proper/commons-dbcp/configuration.html
+         at https://commons.apache.org/proper/commons-dbcp/configuration.html
     -->
     <property name="dbcp.defaultAutoCommit">false</property>
     <property name="dbcp.maxTotal">50</property>
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index 827fd2af6ec058736eca0dd4b1f792af217c536d..c13e4f2ebbd9014588049b6bf6681f001ab3da41 100644
--- a/11/postgres-tomcat/Dockerfile
+++ b/11/postgres-tomcat/Dockerfile
@@ -45,7 +45,7 @@ RUN apt-get update && \
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=11.2
-ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
+ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
 ENV XWIKI_DOWNLOAD_SHA256 8dcdbc3ea28d8929f881c83544409faafbe4e0f462322e6386b6d2ff53f12bfa
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/11/postgres-tomcat/tomcat/setenv.sh b/11/postgres-tomcat/tomcat/setenv.sh
index 7217ccc28037ff5aba6a13d42865be64bfdbc946..755f260ef22e6b02f80c92ae6a07d47610cec7b4 100755
--- a/11/postgres-tomcat/tomcat/setenv.sh
+++ b/11/postgres-tomcat/tomcat/setenv.sh
@@ -22,7 +22,7 @@
 # We're making the following changes to the default:
 # * Adding more memory (default is 512MB which is not enough for XWiki)
 # * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
-#   http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
+#   https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
 #   be able to have '/' and '' in wiki page names.
 # * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
 
diff --git a/11/postgres-tomcat/xwiki/hibernate.cfg.xml b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
index 5dc28b4643c82d3b06b693855d02e877e43f733e..c77c8ba2ff67928500e013659b517992681a7557 100644
--- a/11/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
     <property name="jdbc.use_scrollable_resultset">false</property>
 
     <!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
-         at http://commons.apache.org/proper/commons-dbcp/configuration.html
+         at https://commons.apache.org/proper/commons-dbcp/configuration.html
     -->
     <property name="dbcp.defaultAutoCommit">false</property>
     <property name="dbcp.maxTotal">50</property>
diff --git a/README.md b/README.md
index 00cf42c6c11b3dbb11777444f519090de68a5c72..de26d737fffa5af24ce549ce7ed05d86ac4a4865 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # What is XWiki
 
-[XWiki](http://xwiki.org) is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management.
+[XWiki](https://xwiki.org/) is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management.
 
 As an application wiki, XWiki allows for the storing of structured data and the execution of server side script within the wiki interface. Scripting languages including Velocity, Groovy, Python, Ruby and PHP can be written directly into wiki pages using wiki macros. User-created data structures can be defined in wiki documents and instances of those structures can be attached to wiki documents, stored in a database, and queried using either Hibernate query language or XWiki's own query language.
 
-[XWiki.org's extension wiki](http://extensions.xwiki.org) is home to XWiki extensions ranging from [code snippets](http://snippets.xwiki.org) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it.
+[XWiki.org's extension wiki](https://extensions.xwiki.org/) is home to XWiki extensions ranging from [code snippets](https://snippets.xwiki.org/) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it.
 
-![logo](http://www.xwiki.org/xwiki/bin/view/Main/Logo?xpage=plain&act=svg&finput=logo-xwikiorange.svg&foutput=logo-xwikiorange.png&width=200)
+![logo](https://www.xwiki.org/xwiki/bin/view/Main/Logo?xpage=plain&act=svg&finput=logo-xwikiorange.svg&foutput=logo-xwikiorange.png&width=200)
 
 # Table of contents
 
@@ -359,7 +359,7 @@ secrets:
 
 ## Using an external Solr service
 
-From the [XWiki Solr Search API documentation](http://extensions.xwiki.org/xwiki/bin/view/Extension/Solr%20Search%20API):
+From the [XWiki Solr Search API documentation](https://extensions.xwiki.org/xwiki/bin/view/Extension/Solr%20Search%20API):
 
 > By default XWiki ships with an embedded Solr. This is mostly for ease of use but the embedded instance is not really recommended by the Solr team so you might want to externalize it when starting to have a wiki with a lots of pages. Solr is using a lot of memory and a standalone Solr instance is generally better in term of speed than the embedded one. It should not be much noticeable in a small wiki but if you find yourself starting to have memory issues and slow search results you should probably try to install and setup an external instance of Solr using the guide.
 >
@@ -378,7 +378,7 @@ solr.remote.url=http://$INDEX_HOST:$INDEX_PORT/solr/xwiki
 
 The simplest way to create an external Solr service is using the [official Solr image](https://hub.docker.com/_/solr/).
 
--	Select the appropriate XWiki Solr configuration JAR from [here](http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/) (Note: it's usually better to synchronize it with your version of XWiki)
+-	Select the appropriate XWiki Solr configuration JAR from [here](https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/) (Note: it's usually better to synchronize it with your version of XWiki)
 -	Place this JAR in a directory along side `solr-init.sh` that you can fetch from the [docker-xwiki repository](https://github.com/xwiki-contrib/docker-xwiki/tree/master/contrib/solr)
 -	Ensure that this directory is owned by the Solr user and group `chown -R 8983:8983 /path/to/solr/init/directory`
 -	Launch the Solr container and mount this directory at `/docker-entrypoint-initdb.d`
@@ -574,8 +574,8 @@ The Dockerfile repository is also licensed under the [LGPL 2.1](https://github.c
 
 # Support
 
--	If you wish to raise an issue or an idea of improvement use [XWiki Docker JIRA project](http://jira.xwiki.org/browse/XDOCKER)
--	If you have questions, use the [XWiki Users Mailing List/Forum](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or use the [XWiki IRC channel](http://dev.xwiki.org/xwiki/bin/view/Community/IRC)
+-	If you wish to raise an issue or an idea of improvement use [XWiki Docker JIRA project](https://jira.xwiki.org/browse/XDOCKER)
+-	If you have questions, use the [XWiki Users Mailing List/Forum](https://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or use the [XWiki IRC channel](https://dev.xwiki.org/xwiki/bin/view/Community/IRC)
 
 # Contribute
 
diff --git a/contrib/solr/solr-init.sh b/contrib/solr/solr-init.sh
index 0e68cca8e3742efb05b1be6e82bb7ad8ed7433d5..c94bc4bc0e4a73dbb145b5e723de9d830a73dfb3 100755
--- a/contrib/solr/solr-init.sh
+++ b/contrib/solr/solr-init.sh
@@ -2,7 +2,7 @@
 
 # Usage:
 # - Place the XWiki Solr configuration jar into the same directory as this script
-#	- ex. wget http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/10.1/xwiki-platform-search-solr-server-data-10.1.jar
+#	- ex. wget https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/10.1/xwiki-platform-search-solr-server-data-10.1.jar
 # - ensure that this directory, and it's contents, are owned by the solr user and group, 8983:8983
 #	- ex. chown -R 8983:8983 $PARENT_DIRECTORY
 # - mount the partent directory of this script to /docker-entrypoint-initdb.d/ when you run the Solr container
@@ -36,4 +36,4 @@ unzip -o $jar \
 core='xwiki/*'
 unzip -o $jar \
 	$core \
-	-d $location
\ No newline at end of file
+	-d $location
diff --git a/template/Dockerfile b/template/Dockerfile
index 2e76cabd7ca82b829e87b697517da56d5ae7f867..74b1177b455f5e5e028b25201f24eda153e0629a 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -46,7 +46,7 @@ RUN apt-get update && \\
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=$xwikiVersion
-ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/\${XWIKI_VERSION}"
+ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/\${XWIKI_VERSION}"
 ENV XWIKI_DOWNLOAD_SHA256 $xwikiSha256
 RUN rm -rf /usr/local/tomcat/webapps/* && \\
   mkdir -p /usr/local/tomcat/temp && \\
diff --git a/template/tomcat/setenv.sh b/template/tomcat/setenv.sh
index 13954e2dfb88943dd90ed647965bc52acba18c61..63168405aaaf54818086cf638a3c4bddc225e2e2 100755
--- a/template/tomcat/setenv.sh
+++ b/template/tomcat/setenv.sh
@@ -22,7 +22,7 @@
 # We're making the following changes to the default:
 # * Adding more memory (default is 512MB which is not enough for XWiki)
 # * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
-#   http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
+#   https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
 #   be able to have '/' and '\' in wiki page names.
 # * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
 
diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml
index 73e91169aee2e4a37f8318fbc629521bea2f8b00..2ed09fede142bb228dbae6215c2ae9744507ccb5 100644
--- a/template/xwiki/hibernate.cfg.xml
+++ b/template/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
     <property name="jdbc.use_scrollable_resultset">false</property>
 
     <!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
-         at http://commons.apache.org/proper/commons-dbcp/configuration.html
+         at https://commons.apache.org/proper/commons-dbcp/configuration.html
     -->
     <property name="dbcp.defaultAutoCommit">false</property>
     <property name="dbcp.maxTotal">50</property>