diff --git a/Dockerfile b/Dockerfile
index 02ff11279b0c557097fd859202400b9b916fb070..71cdd3589a0c1522ae41aa0426f79721fb21d081 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,4 +14,4 @@ RUN chown -R www-data:www-data /var/www/
 
 VOLUME /var/www/html
 
-CMD ["/run.sh"]
+ENTRYPOINT ["/run.sh"]
diff --git a/run.sh b/run.sh
index 520268f33310d6bf2a6a19222189908c199d797d..e999dd79e46e0659d5663158a9601287d2005867 100755
--- a/run.sh
+++ b/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ -z "$PS_VERSION"]; then
+if [ -z "$PS_VERSION" ]; then
   echo "Prestashop version not found. Please set up PS_VERSION variable properly."
   exit 1
 fi
@@ -15,4 +15,8 @@ if [ -n "$PLUGIN_NAME" ]; then
   chmod -Rf 777 /var/www/html/modules/$PLUGIN_NAME
 fi
 
-exec /bin/true
+if [ -n "$1" ]; then
+	exec $1
+elseif
+	exec /bin/true
+fi