diff --git a/java/com.sap.sailing.gwt.ui/AdminConsole.html b/java/com.sap.sailing.gwt.ui/AdminConsole.html
index f8e76c2467f..a025ff6ebdd 100644
--- a/java/com.sap.sailing.gwt.ui/AdminConsole.html
+++ b/java/com.sap.sailing.gwt.ui/AdminConsole.html
@@ -12,7 +12,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!--                                                               -->
     <!-- Consider inlining CSS to reduce the number of requested files -->
     <!--                                                               -->
diff --git a/java/com.sap.sailing.gwt.ui/AutoPlay.html b/java/com.sap.sailing.gwt.ui/AutoPlay.html
index 7e44d964ffc..eb4217d4d80 100644
--- a/java/com.sap.sailing.gwt.ui/AutoPlay.html
+++ b/java/com.sap.sailing.gwt.ui/AutoPlay.html
@@ -13,7 +13,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
 
     <!--                                                               -->
     <!-- Consider inlining CSS to reduce the number of requested files -->
diff --git a/java/com.sap.sailing.gwt.ui/DataMining.html b/java/com.sap.sailing.gwt.ui/DataMining.html
index f78ee58a434..45b85666dc4 100644
--- a/java/com.sap.sailing.gwt.ui/DataMining.html
+++ b/java/com.sap.sailing.gwt.ui/DataMining.html
@@ -11,7 +11,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
 	<link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
diff --git a/java/com.sap.sailing.gwt.ui/Home.html b/java/com.sap.sailing.gwt.ui/Home.html
index 50c03fbfc58..9621cb5e3c3 100755
--- a/java/com.sap.sailing.gwt.ui/Home.html
+++ b/java/com.sap.sailing.gwt.ui/Home.html
@@ -7,7 +7,7 @@
     <meta property="og:title" content="${applicationScope['clientConfigurationContext.SAP']} Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" selenium-id="shortcutIcon"/>
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon' selenium-id="appIcon">
 
diff --git a/java/com.sap.sailing.gwt.ui/HomeDesktop.html b/java/com.sap.sailing.gwt.ui/HomeDesktop.html
index 00b4c4c3c71..6fa856a81bd 100644
--- a/java/com.sap.sailing.gwt.ui/HomeDesktop.html
+++ b/java/com.sap.sailing.gwt.ui/HomeDesktop.html
@@ -6,7 +6,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <title>${applicationScope['clientConfigurationContext.SAP']}Sailing - Homepage</title>
diff --git a/java/com.sap.sailing.gwt.ui/HomeMobile.html b/java/com.sap.sailing.gwt.ui/HomeMobile.html
index 00b4c4c3c71..6fa856a81bd 100644
--- a/java/com.sap.sailing.gwt.ui/HomeMobile.html
+++ b/java/com.sap.sailing.gwt.ui/HomeMobile.html
@@ -6,7 +6,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <title>${applicationScope['clientConfigurationContext.SAP']}Sailing - Homepage</title>
diff --git a/java/com.sap.sailing.gwt.ui/Leaderboard.html b/java/com.sap.sailing.gwt.ui/Leaderboard.html
index d22709bf2bc..789c09301d5 100755
--- a/java/com.sap.sailing.gwt.ui/Leaderboard.html
+++ b/java/com.sap.sailing.gwt.ui/Leaderboard.html
@@ -14,7 +14,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
diff --git a/java/com.sap.sailing.gwt.ui/LeaderboardEditing.html b/java/com.sap.sailing.gwt.ui/LeaderboardEditing.html
index 3670e2a5bfc..a67dcd55b7b 100755
--- a/java/com.sap.sailing.gwt.ui/LeaderboardEditing.html
+++ b/java/com.sap.sailing.gwt.ui/LeaderboardEditing.html
@@ -12,7 +12,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
 
     <!--                                                               -->
diff --git a/java/com.sap.sailing.gwt.ui/ManagementConsole.html b/java/com.sap.sailing.gwt.ui/ManagementConsole.html
index a7e6a941d92..83feefa6c92 100644
--- a/java/com.sap.sailing.gwt.ui/ManagementConsole.html
+++ b/java/com.sap.sailing.gwt.ui/ManagementConsole.html
@@ -12,7 +12,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!--                                                               -->
     <!-- Consider inlining CSS to reduce the number of requested files -->
     <!--                                                               -->
diff --git a/java/com.sap.sailing.gwt.ui/PairingList.html b/java/com.sap.sailing.gwt.ui/PairingList.html
index 66cb4440e97..fd567b2b3b0 100644
--- a/java/com.sap.sailing.gwt.ui/PairingList.html
+++ b/java/com.sap.sailing.gwt.ui/PairingList.html
@@ -14,7 +14,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
diff --git a/java/com.sap.sailing.gwt.ui/RaceBoard.html b/java/com.sap.sailing.gwt.ui/RaceBoard.html
index 44a082451e9..e12a0941a30 100644
--- a/java/com.sap.sailing.gwt.ui/RaceBoard.html
+++ b/java/com.sap.sailing.gwt.ui/RaceBoard.html
@@ -14,7 +14,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
diff --git a/java/com.sap.sailing.gwt.ui/RegattaOverview.html b/java/com.sap.sailing.gwt.ui/RegattaOverview.html
index b5430475eb7..d456d265b67 100644
--- a/java/com.sap.sailing.gwt.ui/RegattaOverview.html
+++ b/java/com.sap.sailing.gwt.ui/RegattaOverview.html
@@ -12,7 +12,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
     
diff --git a/java/com.sap.sailing.gwt.ui/Simulator.html b/java/com.sap.sailing.gwt.ui/Simulator.html
index 8e21849ca3a..bf53a1d99d5 100644
--- a/java/com.sap.sailing.gwt.ui/Simulator.html
+++ b/java/com.sap.sailing.gwt.ui/Simulator.html
@@ -11,7 +11,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
diff --git a/java/com.sap.sailing.gwt.ui/Spectator.html b/java/com.sap.sailing.gwt.ui/Spectator.html
index dfad6fcb35f..8f115da121a 100644
--- a/java/com.sap.sailing.gwt.ui/Spectator.html
+++ b/java/com.sap.sailing.gwt.ui/Spectator.html
@@ -16,7 +16,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
     <link href='images/sap-sailing-app-icon${applicationScope['clientConfigurationContext.whitelabeled']}.png' rel='apple-touch-icon'>
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" />
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/sharing/HomeSharingUtils.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/sharing/HomeSharingUtils.java
index 3a77dab40dc..1aa08a088d8 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/sharing/HomeSharingUtils.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/sharing/HomeSharingUtils.java
@@ -30,7 +30,7 @@ public class HomeSharingUtils {
     private static final String REPLACEMENT_KEY_DESCRIPTION = "description";
     private static final String REPLACEMENT_KEY_TITLE = "title";
     private static final Logger logger = Logger.getLogger(HomeSharingUtils.class.getName());
-    private static final String DEFAULT_TEASER_URL = "http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg";
+    private static final String DEFAULT_TEASER_URL = "https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg";
     private static final String SHARED_PROXY_RESOURCE = "/SharedProxy.html";
     private static final String DEFAULT_TITLE = "SAP Sailing";
     private static final String DEFAULT_DESCRIPTION = "Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action "
diff --git a/java/com.sap.sailing.www/index.html b/java/com.sap.sailing.www/index.html
index 7fb6686055b..edad17677bd 100644
--- a/java/com.sap.sailing.www/index.html
+++ b/java/com.sap.sailing.www/index.html
@@ -8,7 +8,7 @@
     <meta property="og:title" content="SAP Sailing" />
     <meta property="og:description" content="Help sailors analyze performance and optimize strategy &#8226; Bring fans closer to the action
         &#8226; Provide the media with information and insights to deliver a greater informed commentary" />
-    <meta property="og:image" content="http://media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
+    <meta property="og:image" content="https://s3-eu-west-1.amazonaws.com/media.sapsailing.com/2014/505Worlds/Images_Homepage/505Worlds2014_eventteaser.jpg" />
     <link rel="shortcut icon" type="image/x-icon" href="images/sap${applicationScope['clientConfigurationContext.whitelabeled']}.ico" selenium-id="shortcutIcon"/>
     <link href="/sailing-normalize-3.0.2.cache.css" rel="stylesheet" type="text/css" />
     <link href="start.css" rel="stylesheet" type="text/css" />