diff --git a/build-helpers/index-maker.js b/build-helpers/index-maker.js
deleted file mode 100644
index 8c9aeba6..00000000
--- a/build-helpers/index-maker.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const indexPath = path.resolve('../dist/index.html');
-
-fs.readFile(indexPath, 'utf8', (err, data) => {
-  if (err) {
-    return console.log(err);
-  }
-
-  const result = data.replace(`<script id="ga-analitics">`, `<script>(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');ga('create','UA-86826463-1','auto');ga('send','pageview');`);
-
-  fs.writeFile(indexPath, result, 'utf8', (err) => {
-    if (err) {
-      return console.log(err);
-    }
-  });
-});
diff --git a/build.js b/build.js
index 77dec2c8..01c6b3e7 100644
--- a/build.js
+++ b/build.js
@@ -1,55 +1,18 @@
-const fs = require('fs');
-const path = require('path');
-const ncp = require('ncp');
-const rimraf = require('rimraf');
-const less = require('less');
-const ng2Inline = require('./build-helpers/inliner');
-
-const inline = (dir) => {
-  let files = fs.readdirSync(dir);
-
-  files.forEach((file) => {
-    const src = path.join(dir, file);
-
-    if (fs.statSync(src).isDirectory()) {
-      inline(src);
-    }
-    else if (src.endsWith('.component.ts')) {
-      ng2Inline(fs.readFileSync(src, 'utf-8'), {
-        base: dir
-      }, dir).then((file) => {
-        fs.writeFileSync(src, file);
-      });
-    }
-  });
-};
-
-console.log('cleaning...');
-rimraf.sync('prebuild', fs, (err) => {
-  if (err) {
-    return console.error(err);
-  }
-});
-
-rimraf.sync('aot', fs, (err) => {
-  if (err) {
-    return console.error(err);
-  }
-});
-
-console.log('done cleaning!');
-
-console.log('cloning src...');
-ncp('src', 'prebuild', (err) => {
-  if (err) {
-    return console.error(err);
-  }
-
-  console.log('done cloning src!');
-
-  console.log('inlining...');
-  inline(path.resolve('./prebuild/'));
-  console.log('done inlining!');
-
-  console.log('ready for ngc!');
-});
\ No newline at end of file
+const fs = require('fs').promises;
+
+async function setGa() {
+  const html = await fs.readFile('./dist/index.html', 'utf-8');
+  const newHtml = html.replace('<!--GA-->', `
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-86826463-1"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'UA-86826463-1');
+    </script>
+  `);
+
+  await fs.writeFile('./dist/index.html', newHtml);
+}
+
+setGa();
diff --git a/package.json b/package.json
index 6775516c..ae3cb30d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "e2e": "ng e2e --port 3200",
     "e2e:quick": "ng e2e --dev-server-target --webdriverUpdate=false",
     "e2e:headless": "HEADLESS=true ng e2e",
-    "build:index": "cd build-helpers && node index-maker.js",
+    "build:index": "node build.js",
     "build:demo": "rm -rf dist/ && ng build --prod --base-href /angular-datepicker/ && npm run build:index",
     "build:prod": "ng-packagr -p package.json",
     "release": "npm run build:prod && npm publish bin",
diff --git a/src/demo/demo/demo.component.ts b/src/demo/demo/demo.component.ts
index dfa9f07d..d0afbb6b 100644
--- a/src/demo/demo/demo.component.ts
+++ b/src/demo/demo/demo.component.ts
@@ -368,14 +368,6 @@ export class DemoComponent implements OnInit {
     console.log(data);
   }
 
-  trackFiver(): void {
-    this.gaService.emitEvent('fiverr', 'clicked');
-  }
-
-  toggleDisabled(disabled: boolean) {
-    disabled ? this.formGroup.disable() : this.formGroup.enable()
-  }
-
   private buildForm(): FormGroup {
     return new FormGroup({
       datePicker: new FormControl({value: this.date, disabled: this.disabled}, [
diff --git a/src/demo/services/ga/ga.service.ts b/src/demo/services/ga/ga.service.ts
index 9c242154..5f0ae229 100644
--- a/src/demo/services/ga/ga.service.ts
+++ b/src/demo/services/ga/ga.service.ts
@@ -1,21 +1,19 @@
 import {Injectable} from '@angular/core';
 import {environment} from '../../../environments/environment';
 
-declare const ga: Function;
+declare const gtag: Function;
 
 @Injectable()
 export class GaService {
 
   public emitEvent(eventCategory: string,
-                   eventAction: string,
-                   eventLabel: string = null,
+                   eventLabel: string,
                    eventValue: number = null) {
-    if (environment.production && window['ga']) {
-      ga('send', 'event', {
-        eventCategory: eventCategory,
-        eventLabel: eventLabel,
-        eventAction: eventAction,
-        eventValue: eventValue
+    if (environment.production && window['gtag']) {
+      gtag('event', 'send', {
+        event_category: eventCategory,
+        event_label: eventLabel,
+        value: eventValue
       });
     }
   }
diff --git a/src/index.html b/src/index.html
index 9a05d081..b39506f4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -16,7 +16,7 @@
   <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 </head>
 <body>
-<script id="ga-analitics"></script>
+<!--GA-->
 
 <dp-demo-root>Loading...</dp-demo-root>