diff --git a/config/default.js b/config/default.js
index a02c21e4c81..52bfce34e41 100644
--- a/config/default.js
+++ b/config/default.js
@@ -48,6 +48,7 @@ module.exports = {
   // must not contain sensitive data.
   clientConfigKeys: [
     'appName',
+    'amoCDN',
     'apiHost',
     'apiPath',
     'cookieName',
diff --git a/src/disco/components/Addon.js b/src/disco/components/Addon.js
index 89891280a57..1c45e053676 100644
--- a/src/disco/components/Addon.js
+++ b/src/disco/components/Addon.js
@@ -27,13 +27,15 @@ export default class Addon extends React.Component {
     headerURL: PropTypes.string,
     heading: PropTypes.string.isRequired,
     id: PropTypes.string.isRequired,
+    imageURL: PropTypes.string,
     name: PropTypes.string.isRequired,
     slug: PropTypes.string.isRequired,
-    subHeading: PropTypes.string,
     status: PropTypes.oneOf(validInstallStates).isRequired,
+    subHeading: PropTypes.string,
     textcolor: PropTypes.string,
-    type: PropTypes.oneOf(validAddonTypes).isRequired,
     themeAction: PropTypes.func,
+    themeURL: PropTypes.string,
+    type: PropTypes.oneOf(validAddonTypes).isRequired,
   }
 
   static defaultProps = {
@@ -56,8 +58,7 @@ export default class Addon extends React.Component {
   }
 
   getLogo() {
-    const { id } = this.props;
-    const imageURL = `https://addons-dev-cdn.allizom.org/user-media/addon_icons/0/${id}-64.png?modified=1388632826`;
+    const { imageURL } = this.props;
     if (this.props.type === EXTENSION_TYPE) {
       return <div className="logo"><img src={imageURL} alt="" /></div>;
     }
@@ -65,8 +66,7 @@ export default class Addon extends React.Component {
   }
 
   getThemeImage() {
-    const { id, name } = this.props;
-    const themeURL = `https://addons-dev-cdn.allizom.org/user-media/addons/${id}/preview_large.jpg?1239806327`;
+    const { name, themeURL } = this.props;
     if (this.props.type === THEME_TYPE) {
       return (<a href="#" className="theme-image"
                  data-browsertheme={this.getBrowserThemeData()}
diff --git a/src/disco/fakeData.js b/src/disco/fakeData.js
index 94656aaac2c..8ca8d627181 100644
--- a/src/disco/fakeData.js
+++ b/src/disco/fakeData.js
@@ -1,3 +1,8 @@
+import config from 'config';
+
+const amoCDN = config.get('amoCDN');
+const amoHost = config.get('apiHost');
+
 export default {
   results: [{
     editorial_description: 'Hover over the image to preview',
@@ -7,9 +12,10 @@ export default {
     slug: 'japanese-tattoo',
     sub_heading: null,
     type: 'Theme',
-    url: 'https://addons-dev.allizom.org/en-US/firefox/addon/japanese-tattoo/',
-    headerURL: 'https://addons-dev-cdn.allizom.org/user-media/addons/18781/personare.jpg?1239806327',
-    footerURL: 'https://addons-dev-cdn.allizom.org/user-media/addons/18781/persona2re.jpg?1239806327',
+    url: `${amoHost}/en-US/firefox/addon/japanese-tattoo/`,
+    themeURL: `${amoCDN}/user-media/addons/18781/preview_large.jpg?1239806327`,
+    headerURL: `${amoCDN}/user-media/addons/18781/personare.jpg?1239806327`,
+    footerURL: `${amoCDN}/user-media/addons/18781/persona2re.jpg?1239806327`,
     textcolor: '#000000',
     accentcolor: '#ffffff',
   }, {
@@ -17,9 +23,10 @@ export default {
     heading: 'Something something',
     sub_heading: 'with NoScript',
     id: 722,
+    imageURL: `${amoCDN}/user-media/addon_icons/0/722-64.png?modified=1388632826`,
     name: 'NoScript Security Suite',
     slug: 'noscript',
     type: 'Extension',
-    url: 'https://addons-dev.allizom.org/en-US/firefox/addon/noscript/',
+    url: `${amoHost}/en-US/firefox/addon/noscript/`,
   }],
 };