diff --git a/couchdb/Dockerfile b/couchdb/Dockerfile
index 949c5174..c8628366 100644
--- a/couchdb/Dockerfile
+++ b/couchdb/Dockerfile
@@ -1 +1,5 @@
 FROM couchdb:3.2.2
+
+# Arguments defined in .env file and passed in from command line or compose build
+ARG maintainer
+LABEL maintainer="${maintainer}"
diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile
index 3d762503..d0352b6c 100644
--- a/rabbitmq/Dockerfile
+++ b/rabbitmq/Dockerfile
@@ -1,12 +1,19 @@
 FROM rabbitmq:3.8.17
 
+# Arguments defined in .env file and passed in from command line or compose build
+ARG maintainer
+ARG rmq_username
+ARG rmq_password
+
+LABEL maintainer="${maintainer}"
+
 # Define environment variables.
-ENV RABBITMQ_USER idss 
-ENV RABBITMQ_PASSWORD idss
+ENV RABBITMQ_USER "${rmq_username}"
+ENV RABBITMQ_PASSWORD "${rmq_password}"
 
 ENV RABBITMQ_PID_FILE /var/lib/rabbitmq/mnesia/rabbitmq
 
-ADD init.sh /init.sh
+ADD ./init.sh /init.sh
 RUN chmod +x /init.sh
 
 EXPOSE 15672