diff --git a/src/templates/base.html b/src/templates/base.html
index 6fa69b2e248bbb94245933e1866be8b794fe1304..496776536c9326a4685b8003390d400ba1f63039 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -125,27 +125,9 @@
 			<a href="https://gitlab.ucc.asn.au/frekk/uccportal">source code</a>
 		</div>
 	</div>
-	{% endblock %}
-	<!-- END Footer -->
-{% if DEPLOYMENT_ENV != "PROD" %}
-<div class="watermark">{{DEPLOYMENT_ENV}}</div>
-<style>
-  .watermark {
-	position: fixed;
-	transform: translate(-50%, -50%);
-	opacity: 0.3;
-	{% if DEPLOYMENT_ENV == "STAGE" %}
-	color: RED;
-	{% else %}
-	color: GREEN;
-	{% endif %}
-	font-size: 15em;
-	top: 50%;
-	left: 50%;
-	pointer-events: none;
-  }
-</style>
-{%endif %}
+
+
+
 </div>
 <!-- END Container -->
 
diff --git a/src/templates/watermark.html b/src/templates/watermark.html
new file mode 100644
index 0000000000000000000000000000000000000000..3278798ed45d0bdcf1c790bbe5fb3383316bfb05
--- /dev/null
+++ b/src/templates/watermark.html
@@ -0,0 +1,24 @@
+{% if DEPLOYMENT_ENV != "PROD" and DEPLOYMENT_ENV != "MOCK" %}
+<div class="watermark">{{DEPLOYMENT_ENV}}</div>
+
+<!-- must be inline as it uses django template tags -->
+<style>
+   .watermark {
+	position: fixed;
+	transform: translate(-50%, -50%);
+	opacity: 0.3;
+	{% if DEPLOYMENT_ENV == "STAGE" %}
+	color: RED; 
+	{% else %}
+	color: GREEN; 
+	{% endif %}
+	font-size: 15em;
+	top: 50%;
+	left: 50%;
+	pointer-events: none;
+	box-sizing: unset;
+  }
+
+</style>
+
+{%endif %}