diff --git a/packages/strapi-admin/admin/src/styles/main.scss b/packages/strapi-admin/admin/src/styles/main.scss
index 2272313713..567216332a 100644
--- a/packages/strapi-admin/admin/src/styles/main.scss
+++ b/packages/strapi-admin/admin/src/styles/main.scss
@@ -1,16 +1,16 @@
 // Import variables
-@import "variables/variables";
-@import "base/fonts";
+@import 'variables/variables';
+@import 'base/fonts';
 
 :global {
   // Expose libs styles
-  @import "libs/bootstrap/bootstrap";
-  @import "libs/fontawesome/fontawesome";
+  @import 'libs/bootstrap/bootstrap';
+  @import 'libs/fontawesome/fontawesome';
 
   // Expose base styles
-  @import "base/bootstrap-override";
-  @import "base/animations";
-  @import "base/animations";
+  @import 'base/bootstrap-override';
+  @import 'base/animations';
+  @import 'base/animations';
 
   // Set the global font-size in order
   // to be able to have `1rem = 10px`.
@@ -18,11 +18,6 @@
     font-size: 62.5%;
   }
 
-  ::-webkit-scrollbar { 
-    display: none; 
-  }
-
-
   * {
     -webkit-font-smoothing: antialiased;
   }
diff --git a/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js b/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
index 39e900c1ac..b277c191da 100644
--- a/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
+++ b/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
@@ -412,6 +412,11 @@ const getType = ({ definition, attribute, name, tableExists = false }) => {
     case 'date':
     case 'time':
     case 'datetime':
+      if (client === 'pg') {
+        return 'timestamp with time zone';
+      }
+
+      return 'timestamp';
     case 'timestamp':
       if (client === 'pg') {
         return 'timestamp with time zone';