diff --git a/curl/docker-entrypoint.sh b/curl/docker-entrypoint.sh
deleted file mode 100644
index 86715d7..0000000
--- a/curl/docker-entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ ! -z "${LOOP}" ]]; then
-	while :
-	do
-		curl "$@" 
-		sleep "${LOOP}"
-	done
-else
-	curl "$@" 
-fi
-
-
-
-
diff --git a/curl/Dockerfile b/loop/Dockerfile
similarity index 100%
rename from curl/Dockerfile
rename to loop/Dockerfile
diff --git a/loop/docker-entrypoint.sh b/loop/docker-entrypoint.sh
new file mode 100644
index 0000000..95ededc
--- /dev/null
+++ b/loop/docker-entrypoint.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+
+if [[ (! -z "${LOOP_DAEMON_USER}" ) && ( "${LOOP_DAEMON_USER}" != "root"  ) ]]; then
+	useradd -r -s /bin/false $LOOP_DAEMON_USER
+	if [[ ! -z "${LOOP_DAEMON_USER_UID}" ]]; then
+		usermod -u $LOOP_DAEMON_USER_UID $LOOP_DAEMON_USER
+	fi
+	if [[ ! -z "${LOOP_DAEMON_USER_GID}" ]]; then
+		groupmod -g $LOOP_DAEMON_USER_GID $LOOP_DAEMON_USER
+	fi
+fi
+
+if [[ ! -z "${LOOP}" ]]; then
+	while :
+	do
+		if [[ ! -z "${LOOP_DAEMON_USER}" ]]; then
+			runuser -u ${LOOP_DAEMON_USER} -- "$@"
+		else
+			"$@"
+		fi
+		sleep "${LOOP}"
+	done
+else
+	if [[ ! -z "${LOOP_DAEMON_USER}" ]]; then
+		runuser -u ${LOOP_DAEMON_USER} -- "$@"
+	else
+		"$@"
+	fi
+fi
+
+
+
+