diff --git a/console/templates/console-base.html b/console/templates/console-base.html
index d0e0e7a..10ef4a3 100644
--- a/console/templates/console-base.html
+++ b/console/templates/console-base.html
@@ -1,11 +1,12 @@
+{% load staticfiles %}
 {% load i18n %}
 <html>
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico">
+    <link rel="shortcut icon" href="{% static "img/favicon.ico" %}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
-    <link href="{{ STATIC_URL }}css/webvirtcloud.css" rel="stylesheet">
+    <link rel="stylesheet" href="{% static "css/bootstrap.min.css" %}">
+    <link href="{% static "css/webvirtcloud.css" %}" rel="stylesheet">
 
     <style>
         body {
@@ -92,8 +93,8 @@
 <div id='main_container' class="container">
 {% block content %}{% endblock %}
 </div>
-<script src="{{ STATIC_URL }}js/jquery.js"></script>
-<script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
+<script src="{% static "js/jquery.js" %}"></script>
+<script src="{% static "js/bootstrap.min.js" %}"></script>
 
 <script>
     function log_message(msg,type) {
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index deda273..1880681 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% load i18n %}
 {% block title %}{% trans "Instance" %} - {{ vname }}{% endblock %}
 {% block content %}
@@ -1009,7 +1010,7 @@
                 </div>
 {% endblock %}
 {% block script %}
-<script src="{{ STATIC_URL }}/js/ace.js" type="text/javascript" charset="utf-8"></script>
+<script src="{% static "js/ace.js" %}" type="text/javascript" charset="utf-8"></script>
 <script>
     var editor = ace.edit("editor");
     editor.getSession().setMode("ace/mode/xml");
@@ -1146,7 +1147,7 @@
         });
     });
 </script>
-<script src="{{ STATIC_URL }}js/Chart.min.js"></script>
+<script src="{% static "js/Chart.min.js" %}"></script>
 <script>
     $('#chartgraphs').on('shown.bs.tab', function (event) {
         var cpuLineData = {
