diff --git a/website/dynamic/users.yml b/website/dynamic/users.yml
new file mode 100644
index 000000000000..7ea6e9711e8a
--- /dev/null
+++ b/website/dynamic/users.yml
@@ -0,0 +1,95 @@
+-
+  caption: "Angular.Schule"
+  image: "/img/companies/angular-schule.svg"
+  infoLink: "https://angular.schule/"
+  pinned: false
+-
+  caption: ASKUL
+  image: "/img/companies/logo-askul-01.gif"
+  infoLink: "https://www.askul.co.jp/"
+  pinned: true
+-
+  caption: "b<>com"
+  image: "/img/companies/b-com.png"
+  infoLink: "https://b-com.com/en"
+  pinned: false
+-
+  caption: "Bithost GmbH"
+  image: "/img/companies/bithost.svg"
+  infoLink: "https://www.bithost.ch/"
+  pinned: true
+-
+  caption: Boxever
+  image: "/img/companies/boxever.svg"
+  infoLink: "https://www.boxever.com/"
+  pinned: false
+-
+  caption: "GMO Pepabo"
+  image: "/img/companies/pepabo.png"
+  infoLink: "https://pepabo.com/en/"
+  pinned: false
+-
+  caption: JustStar
+  image: "/img/companies/juststar.png"
+  infoLink: "https://www.juststarinfo.com/"
+  pinned: true
+-
+  caption: Klarna
+  image: "/img/companies/klarna.svg"
+  infoLink: "https://www.klarna.com/us/"
+  pinned: false
+-
+  caption: Metaswitch
+  image: "/img/companies/metaswitch.svg"
+  infoLink: "https://www.metaswitch.com/"
+  pinned: true
+-
+  caption: Myworkout
+  image: "/img/companies/myworkout.png"
+  infoLink: "https://myworkout.com/"
+  pinned: false
+-
+  caption: "Raiffeisen Schweiz Genossenschaft"
+  image: "/img/companies/raiffeisen.png"
+  infoLink: "https://www.raiffeisen.ch/"
+  pinned: false
+-
+  caption: "RepreZen API Studio"
+  image: "/img/companies/reprezen.png"
+  infoLink: "https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development"
+  pinned: false
+-
+  caption: "REST United"
+  image: "/img/companies/rest-united.png"
+  infoLink: "https://restunited.com/"
+  pinned: false
+-
+  caption: Stingray
+  image: "/img/companies/stingray.png"
+  infoLink: "http://www.stingray.com/"
+  pinned: true
+-
+  caption: Suva
+  image: "/img/companies/suva.svg"
+  infoLink: "https://www.suva.ch/"
+  pinned: false
+-
+  caption: Telstra
+  image: "/img/companies/telstra.svg"
+  infoLink: "https://dev.telstra.com/"
+  pinned: true
+-
+  caption: "TUI InfoTec GmbH"
+  image: "/img/companies/infotec.png"
+  infoLink: "http://www.tui-infotec.com/"
+  pinned: false
+-
+  caption: "unblu inc."
+  image: "/img/companies/unblu.svg"
+  infoLink: "https://www.unblu.com/"
+  pinned: true
+-
+  caption: Zalando
+  image: "/img/companies/zalando.jpg"
+  infoLink: "https://www.zalando.com/"
+  pinned: true
\ No newline at end of file
diff --git a/website/pages/en/team.js b/website/pages/en/team.js
index 26dfca9140c4..4b08e7748a27 100644
--- a/website/pages/en/team.js
+++ b/website/pages/en/team.js
@@ -77,9 +77,10 @@ const MemberGroup = props => {
 class Team extends React.Component {
     render() {
         const team = siteConfig.team;
+        const editUrl = `${siteConfig.repoUrl}/edit/master/website/dynamic/team.yml`;
         return (
             <div>
-                <EditThisPage title="The Team" url="https://github.com/openapitools/openapi-generator/blob/master/website/dynamic/team.yml" />
+                <EditThisPage title="The Team" url={editUrl} />
                 <Container padding={["bottom"]}>
                     <div>
                         <MemberGroup title="Core Team" members={team.core} />
diff --git a/website/pages/en/users.js b/website/pages/en/users.js
index 039dc39ffa50..79226d3c594d 100755
--- a/website/pages/en/users.js
+++ b/website/pages/en/users.js
@@ -6,9 +6,12 @@
  */
 
 const React = require('react');
+const path = require("path");
 
 const CompLibrary = require('../../core/CompLibrary.js');
 
+const EditThisPage = require(path.resolve(process.cwd(), "core/EditThisPage.js"));
+
 const Container = CompLibrary.Container;
 
 class Users extends React.Component {
@@ -18,7 +21,7 @@ class Users extends React.Component {
       return null;
     }
 
-    const editUrl = `${siteConfig.repoUrl}/edit/master/website/siteConfig.js`;
+    const editUrl = `${siteConfig.repoUrl}/edit/master/website/dynamic/team.yml`;
     const showcase = siteConfig.users.map(user => (
       <a href={user.infoLink} key={user.infoLink}>
         <img src={user.image} alt={user.caption} title={user.caption} />
@@ -26,21 +29,15 @@ class Users extends React.Component {
     ));
 
     return (
-      <div className="mainContainer">
-        <Container padding={['bottom', 'top']}>
-          <div className="showcaseSection">
-            <div className="prose">
-              <h1>Who is Using This?</h1>
-              <p>This project is used by many folks</p>
-            </div>
-            <div className="logos">{showcase}</div>
-            <p>Are you using this project?</p>
-            <a href={editUrl} className="button">
-              Add your company
-            </a>
+      <Container padding={['bottom']}>
+        <EditThisPage title="Who is Using This?" url={editUrl} />
+        <div className="showcaseSection">
+          <div className="prose">
+            <p>This project is used by many folks</p>
           </div>
-        </Container>
-      </div>
+          <div className="logos">{showcase}</div>
+        </div>
+      </Container>
     );
   }
 }
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 0c8c388fdc9c..04b0ae72c99f 100755
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -8,133 +8,7 @@ const loadYaml = relativePath => parseYaml(fs.readFileSync(path.join(__dirname,
 // site configuration options.
 
 const team = loadYaml("dynamic/team.yml");
-
-const users = [
-  // {
-  //   caption: 'User1',
-  //   // You will need to prepend the image path with your baseUrl
-  //   // if it is not '/', like: '/test-site/img/docusaurus.svg'.
-  //   image: '/img/docusaurus.svg',
-  //   infoLink: 'https://www.facebook.com',
-  //   pinned: true,
-  // },
-
-  {
-    caption: 'Angular.Schule',
-    image: '/img/companies/angular-schule.svg',
-    infoLink: 'https://angular.schule/',
-    pinned: false,
-  },
-  {
-    caption: 'ASKUL',
-    image: '/img/companies/logo-askul-01.gif',
-    infoLink: 'https://www.askul.co.jp/',
-    pinned: true,
-  },
-  {
-    caption: 'b<>com',
-    image: '/img/companies/b-com.png',
-    infoLink: 'https://b-com.com/en',
-    pinned: false,
-  },
-  {
-    caption: 'Bithost GmbH',
-    image: '/img/companies/bithost.svg',
-    infoLink: 'https://www.bithost.ch/',
-    pinned: true,
-  },
-  {
-    caption: 'Boxever',
-    image: '/img/companies/boxever.svg',
-    infoLink: 'https://www.boxever.com/',
-    pinned: false,
-  },
-  {
-    caption: 'GMO Pepabo',
-    image: '/img/companies/pepabo.png',
-    infoLink: 'https://pepabo.com/en/',
-    pinned: false,
-  },
-  {
-    caption: 'JustStar',
-    image: '/img/companies/juststar.png',
-    infoLink: 'https://www.juststarinfo.com/',
-    pinned: true,
-  },
-  {
-    caption: 'Klarna',
-    image: '/img/companies/klarna.svg',
-    infoLink: 'https://www.klarna.com/us/',
-    pinned: false,
-  },
-  {
-    caption: 'Metaswitch',
-    image: '/img/companies/metaswitch.svg',
-    infoLink: 'https://www.metaswitch.com/',
-    pinned: true,
-  },
-  {
-    caption: 'Myworkout',
-    image: '/img/companies/myworkout.png',
-    infoLink: 'https://myworkout.com/',
-    pinned: false,
-  },
-  {
-    caption: 'Raiffeisen Schweiz Genossenschaft',
-    image: '/img/companies/raiffeisen.png',
-    infoLink: 'https://www.raiffeisen.ch/',
-    pinned: false,
-  },
-  {
-    caption: 'RepreZen API Studio',
-    image: '/img/companies/reprezen.png',
-    infoLink: 'https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development',
-    pinned: false,
-  },
-  {
-    caption: 'REST United',
-    image: '/img/companies/rest-united.png',
-    infoLink: 'https://restunited.com/',
-    pinned: false,
-  },
-  {
-    caption: 'Stingray',
-    image: '/img/companies/stingray.png',
-    infoLink: 'http://www.stingray.com/',
-    pinned: true,
-  },
-  {
-    caption: 'Suva',
-    image: '/img/companies/suva.svg',
-    infoLink: 'https://www.suva.ch/',
-    pinned: false,
-  },
-  {
-    caption: 'Telstra',
-    image: '/img/companies/telstra.svg',
-    infoLink: 'https://dev.telstra.com/',
-    pinned: true,
-  },
-
-  {
-    caption: 'TUI InfoTec GmbH',
-    image: '/img/companies/infotec.png',
-    infoLink: 'http://www.tui-infotec.com/',
-    pinned: false,
-  },
-  {
-    caption: 'unblu inc.',
-    image: '/img/companies/unblu.svg',
-    infoLink: 'https://www.unblu.com/',
-    pinned: true,
-  },
-  {
-    caption: 'Zalando',
-    image: '/img/companies/zalando.jpg',
-    infoLink: 'https://www.zalando.com/',
-    pinned: true,
-  },
-];
+const users = loadYaml("dynamic/users.yml");
 
 const siteConfig = {
   title: 'OpenAPI Generator', // Title for your website.
@@ -219,7 +93,7 @@ const siteConfig = {
 
   // You may provide arbitrary config keys to be used as needed by your
   // template. For example, if you need your repo's URL...
-  repoUrl: 'https://https://github.com/OpenAPITools/openapi-generator',
+  repoUrl: 'https://github.com/OpenAPITools/openapi-generator',
 
   team: team,
 };