diff --git a/apache/Dockerfile b/httpd/Dockerfile
similarity index 77%
rename from apache/Dockerfile
rename to httpd/Dockerfile
index 70f489e..3689004 100644
--- a/apache/Dockerfile
+++ b/httpd/Dockerfile
@@ -1,3 +1,3 @@
-FROM httpd:2.4.41
+FROM httpd:2.4.58
 
 RUN echo "IncludeOptional conf.d/*.conf" >> conf/httpd.conf
diff --git a/shinobi/Dockerfile b/shinobi/Dockerfile
new file mode 100644
index 0000000..233c74d
--- /dev/null
+++ b/shinobi/Dockerfile
@@ -0,0 +1 @@
+FROM registry.gitlab.com/shinobi-systems/shinobi:latest