diff --git a/scripts/run.sh b/scripts/run.sh
new file mode 100644
index 0000000..8dc02cc
--- /dev/null
+++ b/scripts/run.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+/home/hias/.conda/envs/hias/bin/python3 /home/YourUser/hias-core/components/agents/hiasbch/agent.py
\ No newline at end of file
diff --git a/scripts/service.sh b/scripts/service.sh
index b4806a2..8c902fd 100644
--- a/scripts/service.sh
+++ b/scripts/service.sh
@@ -1,54 +1,37 @@
 #!/bin/bash
 
-FMSG="- HIASBCH MQTT Blockchain Agent service installation terminated"
+FMSG="HIAS MQTT Blockchain IoT Agent service installation terminated!"
 
-echo "This script will install the HIASBCH MQTT Blockchain Agent service on your device."
-read -p "Proceed (y/n)? " proceed
+printf -- 'This script will install the HIAS MQTT Blockchain IoT Agent service on HIAS Core.\n';
 
+read -p "Proceed (y/n)? " proceed
 if [ "$proceed" = "Y" -o "$proceed" = "y" ]; then
-	echo "- Installing HIASBCH MQTT Blockchain Agent service"
-	sudo touch /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "[Unit]" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "Description=HIASBCH MQTT Blockchain Agent service" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "After=multi-user.target" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "After=HIASCDI.service" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "[Service]" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "User=$USER" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "Type=simple" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "Restart=on-failure" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "ExecStart=/usr/bin/python3 /home/$USER/HIAS/components/agents/hiasbch/agent.py" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "[Install]" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "WantedBy=multi-user.target" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-	echo "" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent.service
-
-	echo "- Installing HIASBCH MQTT Blockchain Agent Replenish service"
-	sudo touch /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "[Unit]" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "Description=HIASBCH MQTT Blockchain Agent service" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "After=multi-user.target" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "After=HIASCDI.service" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "[Service]" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "User=$USER" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "Type=simple" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "Restart=on-failure" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "ExecStart=/usr/bin/python3 /home/$USER/HIAS/components/agents/hiasbch/replenish.py" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "[Install]" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "WantedBy=multi-user.target" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	echo "" | sudo tee -a /lib/systemd/system/HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-
-	sudo systemctl enable HIASBCH-MQTT-Blockchain-Agent.service
-	sudo systemctl start HIASBCH-MQTT-Blockchain-Agent.service
-
-	sudo systemctl enable HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-	sudo systemctl start HIASBCH-MQTT-Blockchain-Agent-Replenish.service
-
-	echo "- Installed HIASBCH MQTT Blockchain Agent service!";
-	exit 0
+
+        printf -- 'Installing HIAS MQTT Blockchain IoT Agent service.\n';
+        sudo touch /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "[Unit]" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "Description=HIAS-MQTT-Blockchain-IoT-Agent service" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "After=multi-user.target" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "After=HIASCDI.service" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "[Service]" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "User=$USER" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "Type=simple" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "Restart=on-failure" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "ExecStart=/home/$USER/hias-core/components/agents/hiasbch/scripts/run.sh" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "[Install]" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "WantedBy=multi-user.target" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+        echo "" | sudo tee -a /lib/systemd/system/HIAS-MQTT-Blockchain-IoT-Agent.service
+
+        sudo systemctl enable HIAS-MQTT-Blockchain-IoT-Agent.service
+
+        sudo sed -i -- "s/YourUser/$USER/g" /home/$USER/hias-core/components/agents/hiasbch/scripts/run.sh
+        sudo chmod 744 /home/$USER/hias-core/components/agents/hiasbch/scripts/run.sh
+
+        printf -- '\033[32m SUCCESS: HIAS MQTT Blockchain IoT Agent service installed! \033[0m\n';
+
 else
-	echo $FMSG;
-	exit 1
+    echo $FMSG;
+    exit
 fi
\ No newline at end of file