diff --git a/gatsby-ssr.js b/gatsby-ssr.js
index 2c309cb..c3533a6 100644
--- a/gatsby-ssr.js
+++ b/gatsby-ssr.js
@@ -13,5 +13,9 @@ exports.onRenderBody = ({ setPostBodyComponents }) =>
     <script
       key={`gatsby-plugin-oembed-flickr`}
       src="https://embedr.flickr.com/assets/client-code.js"
+    />,
+    <script
+      key={`gatsby-plugin-oembed-flickr`}
+      src="https://embed.redditmedia.com/widgets/platform.js"
     />
   ]);
diff --git a/helpers.js b/helpers.js
index ee07bb5..235233d 100644
--- a/helpers.js
+++ b/helpers.js
@@ -2,23 +2,84 @@ const select = require("unist-util-select");
 const axios = require("axios");
 
 const OEMBED_PROVIDERS_URL = "https://oembed.com/providers.json";
+const ENDPOINTS = {
+  YouTube: {
+    schemes: [
+      "http://*.youtube.com/watch*",
+      "http://*.youtube.com/v/*",
+      "http://youtu.be/*"
+    ],
+    url: "https://www.youtube.com/oembed"
+  },
+  Nasjonalbiblioteket: {
+    schemes: ["https://www.nb.no/items/*"],
+    url: "https://api.nb.no/catalog/v1/oembed"
+  }
+};
+
+const ADD_HTTPS_TO_SCHEMES = [
+  "amCharts Live Editor",
+  "YouTube",
+  "Flickr",
+  "MixCloud"
+];
+const ADD_HTTPS_TO_ENDPOINT_URL = ["amCharts Live Editor"];
 
 exports.fetchOembedProviders = async () => {
   const response = await axios.get(OEMBED_PROVIDERS_URL);
   return response.data;
 };
 
+exports.ammendProviders = providers => {
+  const ammendEndpoints = (endpoints = [], providerName) => {
+    if (ENDPOINTS[providerName]) {
+      endpoints = endpoints.concat(ENDPOINTS[providerName]);
+    }
+    return endpoints;
+  };
+
+  const ammendSchemes = (schemes = [], providerName) => {
+    if (ADD_HTTPS_TO_SCHEMES.includes(providerName)) {
+      const httpsSchemes = [...schemes].map(scheme =>
+        scheme.replace("http", "https")
+      );
+      schemes = schemes.concat(httpsSchemes);
+    }
+    return schemes;
+  };
+
+  const ammendEndpointUrl = (endpointUrl = "", providerName) => {
+    endpointUrl = endpointUrl.replace("{format}", "json");
+    if (ADD_HTTPS_TO_ENDPOINT_URL.includes(providerName)) {
+      endpointUrl = endpointUrl.replace("http", "https");
+    }
+    return endpointUrl;
+  };
+
+  return providers.map(provider => {
+    const providerName = provider.provider_name;
+    provider.endpoints = ammendEndpoints(provider.endpoints, providerName).map(
+      endpoint => {
+        endpoint.schemes = ammendSchemes(endpoint.schemes, providerName);
+        endpoint.url = ammendEndpointUrl(endpoint.url, providerName);
+        return endpoint;
+      }
+    );
+    return provider;
+  });
+};
+
 exports.getProviderEndpointUrlForLinkUrl = (linkUrl, providers) => {
   let endpointUrl = false;
 
   for (const provider of providers) {
-    for (const endpoint of provider.endpoints || []) {
-      for (let schema of endpoint.schemes || []) {
+    for (const endpoint of provider.endpoints) {
+      for (let schema of endpoint.schemes) {
         try {
           schema = schema.replace("*", ".*");
           const regExp = new RegExp(schema);
           if (regExp.test(linkUrl)) {
-            endpointUrl = endpoint.url.replace("{format}", "json");
+            endpointUrl = endpoint.url;
           }
         } catch (error) {
           console.log(
diff --git a/index.js b/index.js
index 506dea8..391aaf6 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,7 @@
 const Promise = require("bluebird");
 
 const {
+  ammendProviders,
   fetchOembedProviders,
   fetchOembed,
   getProviderEndpointUrlForLinkUrl,
@@ -15,7 +16,8 @@ module.exports = async ({ markdownAST }) => {
   );
   try {
     // Step 1.  Fetch the oembed provider list.
-    const providers = await fetchOembedProviders();
+    let providers = await fetchOembedProviders();
+    providers = ammendProviders(providers);
 
     // Step 2.  Find link nodes in markdown structure that are on their own, not part of some other content.
     const possibleOmbedUrlNodes = selectPossibleOembedLinkNodes(markdownAST);