diff --git a/orientdb/tasks/main.yml b/orientdb/tasks/main.yml
index ef8c370..2e7017f 100644
--- a/orientdb/tasks/main.yml
+++ b/orientdb/tasks/main.yml
@@ -18,6 +18,7 @@
 
     - name: Install the orientdb startup script
       template: src=orientdb.init.j2 dest=/etc/init.d/orientdb owner=root group=root mode=0755
+      tags: [ 'orientdb', 'orientdb_init' ]
 
     - name: Create a orientdb log directory out of the distribution directory
       file: dest={{ orientdb_log_dir }} state=directory owner={{ orientdb_user }} group={{ orientdb_user }} mode=0755
diff --git a/orientdb/templates/orientdb.init.j2 b/orientdb/templates/orientdb.init.j2
index 0ad1f4c..d5839bd 100755
--- a/orientdb/templates/orientdb.init.j2
+++ b/orientdb/templates/orientdb.init.j2
@@ -41,7 +41,7 @@ stop() {
 	fi
 	echo "Stopping OrientDB server daemon..."
 	cd "$ORIENTDB_DIR/bin"
-	su $ORIENTDB_USER -c "cd \"$ORIENTDB_DIR/bin\"; /usr/bin/nohup ./shutdown.sh >> {{ orientdb_log_dir }}/orientdb.log 2>&1 &"
+	su $ORIENTDB_USER -c "cd \"$ORIENTDB_DIR/bin\"; /usr/bin/nohup ./shutdown.sh >> {{ orientdb_log_dir }}/orientdb.log 2>&1"
 }
 
 status() {