diff --git a/.gitignore b/.gitignore
index 2321bf3..c344294 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,5 +174,4 @@ migrations/
 htmlcov/
 .second_run
 
-network_inventory/static/
-!network_inventory/static/core
+/static
diff --git a/network_inventory/static/core/.versions b/core/static/core/.versions
similarity index 100%
rename from network_inventory/static/core/.versions
rename to core/static/core/.versions
diff --git a/network_inventory/static/core/css/bootstrap-grid.css b/core/static/core/css/bootstrap-grid.css
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-grid.css
rename to core/static/core/css/bootstrap-grid.css
diff --git a/network_inventory/static/core/css/bootstrap-grid.css.map b/core/static/core/css/bootstrap-grid.css.map
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-grid.css.map
rename to core/static/core/css/bootstrap-grid.css.map
diff --git a/network_inventory/static/core/css/bootstrap-grid.min.css b/core/static/core/css/bootstrap-grid.min.css
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-grid.min.css
rename to core/static/core/css/bootstrap-grid.min.css
diff --git a/network_inventory/static/core/css/bootstrap-grid.min.css.map b/core/static/core/css/bootstrap-grid.min.css.map
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-grid.min.css.map
rename to core/static/core/css/bootstrap-grid.min.css.map
diff --git a/network_inventory/static/core/css/bootstrap-reboot.css b/core/static/core/css/bootstrap-reboot.css
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-reboot.css
rename to core/static/core/css/bootstrap-reboot.css
diff --git a/network_inventory/static/core/css/bootstrap-reboot.css.map b/core/static/core/css/bootstrap-reboot.css.map
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-reboot.css.map
rename to core/static/core/css/bootstrap-reboot.css.map
diff --git a/network_inventory/static/core/css/bootstrap-reboot.min.css b/core/static/core/css/bootstrap-reboot.min.css
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-reboot.min.css
rename to core/static/core/css/bootstrap-reboot.min.css
diff --git a/network_inventory/static/core/css/bootstrap-reboot.min.css.map b/core/static/core/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from network_inventory/static/core/css/bootstrap-reboot.min.css.map
rename to core/static/core/css/bootstrap-reboot.min.css.map
diff --git a/network_inventory/static/core/css/bootstrap.css b/core/static/core/css/bootstrap.css
similarity index 100%
rename from network_inventory/static/core/css/bootstrap.css
rename to core/static/core/css/bootstrap.css
diff --git a/network_inventory/static/core/css/bootstrap.css.map b/core/static/core/css/bootstrap.css.map
similarity index 100%
rename from network_inventory/static/core/css/bootstrap.css.map
rename to core/static/core/css/bootstrap.css.map
diff --git a/network_inventory/static/core/css/bootstrap.min.css b/core/static/core/css/bootstrap.min.css
similarity index 100%
rename from network_inventory/static/core/css/bootstrap.min.css
rename to core/static/core/css/bootstrap.min.css
diff --git a/network_inventory/static/core/css/bootstrap.min.css.map b/core/static/core/css/bootstrap.min.css.map
similarity index 100%
rename from network_inventory/static/core/css/bootstrap.min.css.map
rename to core/static/core/css/bootstrap.min.css.map
diff --git a/network_inventory/static/core/js/bootstrap.bundle.js b/core/static/core/js/bootstrap.bundle.js
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.bundle.js
rename to core/static/core/js/bootstrap.bundle.js
diff --git a/network_inventory/static/core/js/bootstrap.bundle.js.map b/core/static/core/js/bootstrap.bundle.js.map
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.bundle.js.map
rename to core/static/core/js/bootstrap.bundle.js.map
diff --git a/network_inventory/static/core/js/bootstrap.bundle.min.js b/core/static/core/js/bootstrap.bundle.min.js
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.bundle.min.js
rename to core/static/core/js/bootstrap.bundle.min.js
diff --git a/network_inventory/static/core/js/bootstrap.bundle.min.js.map b/core/static/core/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.bundle.min.js.map
rename to core/static/core/js/bootstrap.bundle.min.js.map
diff --git a/network_inventory/static/core/js/bootstrap.js b/core/static/core/js/bootstrap.js
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.js
rename to core/static/core/js/bootstrap.js
diff --git a/network_inventory/static/core/js/bootstrap.js.map b/core/static/core/js/bootstrap.js.map
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.js.map
rename to core/static/core/js/bootstrap.js.map
diff --git a/network_inventory/static/core/js/bootstrap.min.js b/core/static/core/js/bootstrap.min.js
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.min.js
rename to core/static/core/js/bootstrap.min.js
diff --git a/network_inventory/static/core/js/bootstrap.min.js.map b/core/static/core/js/bootstrap.min.js.map
similarity index 100%
rename from network_inventory/static/core/js/bootstrap.min.js.map
rename to core/static/core/js/bootstrap.min.js.map
diff --git a/network_inventory/static/core/js/jquery.slim.min.js b/core/static/core/js/jquery.slim.min.js
similarity index 100%
rename from network_inventory/static/core/js/jquery.slim.min.js
rename to core/static/core/js/jquery.slim.min.js
diff --git a/network_inventory/static/core/js/popper.min.js b/core/static/core/js/popper.min.js
similarity index 100%
rename from network_inventory/static/core/js/popper.min.js
rename to core/static/core/js/popper.min.js
diff --git a/network_inventory/settings/base.py b/network_inventory/settings/base.py
index 6c9cdb6..bb0f596 100644
--- a/network_inventory/settings/base.py
+++ b/network_inventory/settings/base.py
@@ -125,7 +125,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")
 
 DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
 CRISPY_TEMPLATE_PACK = 'bootstrap4'