diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 0b7a4d41..3be6cff3 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -5,6 +5,7 @@
 // about supported directives.
 //
 //= require jquery/dist/jquery.slim.js
+//= require bootstrap/dist/js/bootstrap.bundle.js
 //= require jquery.limit-1.2
 //= require leaflet
 //= require Control.Loading.js
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 330faeeb..0d864f1f 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -15,6 +15,7 @@
  *= require messenger
  *= require messenger-theme-flat
  *= require trumbowyg/trumbowyg
+ *= require bootstrap/dist/css/bootstrap.min.css
  *= require flatpickr
  *= require leaflet
  *= stub active_admin
diff --git a/app/views/application/_head.html.haml b/app/views/application/_head.html.haml
index fc36db38..e41bdaf5 100644
--- a/app/views/application/_head.html.haml
+++ b/app/views/application/_head.html.haml
@@ -14,8 +14,6 @@
   %meta{content: "1349222175", property: "fb:admins"}/
 
   = javascript_include_tag "application", "data-turbolinks-track" => true
-  %link{href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.0/css/bootstrap.min.css", rel: "stylesheet", integrity: "sha384-SI27wrMjH3ZZ89r4o+fGIJtnzkAnFs3E4qz9DIYioCQ5l9Rd/7UAa8DHcaL8jkWt", crossorigin: "anonymous"}
-  %script{src: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.0/js/bootstrap.bundle.min.js", integrity: "sha384-Iep5TjrwnXOp2AdreAjhlprhxI5Ix8Y3I/zJd1tNQZQmonaE3i6fTdrvIG9YjOWl", crossorigin: "anonymous"}
 
   %link{rel: "canonical", href: "#{request.url.split('?').first}"}
   %link{rel: "stylesheet", href: "https://api.mapbox.com/mapbox.js/v3.0.1/mapbox.css"}
diff --git a/package.json b/package.json
index 405d6600..edd498b3 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,9 @@
   "version": "1.0.0",
   "main": "index.js",
   "repository": "git@github.com:fablabbcn/fablabs.io.git",
-  "author": "Viktor Smari <viktorsmari@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "bootstrap-datepicker": "~1.6.4",
+    "bootstrap": "^4.4.1",
     "jquery": "~3.7.0",
     "leaflet": "~1.0.3",
     "leaflet-spin": "~1.1.0",
diff --git a/yarn.lock b/yarn.lock
index d33fa92c..fe65a452 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,14 +2,12 @@
 # yarn lockfile v1
 
 
-bootstrap-datepicker@~1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.6.4.tgz#889ebeced8eaa2ff15ec1f273e4b07531cc43da0"
-  integrity sha512-dPEUbP2JlWGHJWJEWfBIyFFR+iMgERj/bZR1oHqlaCRke2oILljMMFrlMZrgdpZigj5Ly9TdZzCNuYz4hRJ+7A==
-  dependencies:
-    jquery ">=1.7.1"
+bootstrap@^4.4.1:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
+  integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
 
-jquery@>=1.7.1, jquery@~3.7.0:
+jquery@~3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.0.tgz#fe2c01a05da500709006d8790fe21c8a39d75612"
   integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==