diff --git a/monkey/monkey_island/deb-package/DEBIAN/control b/monkey/monkey_island/deb-package/DEBIAN/control
index 2693afbd9..88723149c 100644
--- a/monkey/monkey_island/deb-package/DEBIAN/control
+++ b/monkey/monkey_island/deb-package/DEBIAN/control
@@ -5,4 +5,4 @@ Homepage: http://www.guardicore.com
 Priority: optional
 Version: 1.0
 Description: Guardicore Infection Monkey Island installation package
-Depends: openssl, python-pip, python-dev
+Depends: openssl, python3-pip, python3-dev
diff --git a/monkey/monkey_island/deb-package/DEBIAN/postinst b/monkey/monkey_island/deb-package/DEBIAN/postinst
index 8efc19bbb..93053a76e 100644
--- a/monkey/monkey_island/deb-package/DEBIAN/postinst
+++ b/monkey/monkey_island/deb-package/DEBIAN/postinst
@@ -5,8 +5,8 @@ INSTALLATION_FOLDER=/var/monkey/monkey_island/installation
 PYTHON_FOLDER=/var/monkey/monkey_island/bin/python
 
 # Prepare python virtualenv
-pip2 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER
-virtualenv -p python2.7 ${PYTHON_FOLDER}
+pip3 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER
+virtualenv -p python3 ${PYTHON_FOLDER}
 
 # install pip requirements
 ${PYTHON_FOLDER}/bin/python -m pip install -r $MONKEY_FOLDER/monkey_island/requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER
diff --git a/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst b/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst
index 76e57caa3..42dc2d5a2 100644
--- a/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst
+++ b/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst
@@ -5,8 +5,8 @@ INSTALLATION_FOLDER=/var/monkey/monkey_island/installation
 PYTHON_FOLDER=/var/monkey/monkey_island/bin/python
 
 # Prepare python virtualenv
-pip2 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER
-virtualenv -p python2.7 ${PYTHON_FOLDER}
+pip3 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER
+virtualenv -p python3 ${PYTHON_FOLDER}
 
 # install pip requirements
 ${PYTHON_FOLDER}/bin/python -m pip install -r $MONKEY_FOLDER/monkey_island/requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER
diff --git a/monkey/monkey_island/linux/install.sh b/monkey/monkey_island/linux/install.sh
index d4ebfedbe..ab03e4798 100644
--- a/monkey/monkey_island/linux/install.sh
+++ b/monkey/monkey_island/linux/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MACHINE_TYPE=`uname -m`
-if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+MACHINE_TYPE=$(uname -m)
+if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
   # 64-bit stuff here
   ARCH=64
 else
@@ -11,4 +11,4 @@ fi
 
 MONKEY_FILE=monkey-linux-$ARCH
 cp -f /var/monkey/monkey_island/cc/binaries/$MONKEY_FILE /tmp
-/tmp/$MONKEY_FILE m0nk3y $@
+/tmp/$MONKEY_FILE m0nk3y "$@"
diff --git a/monkey/monkey_island/linux/monkey.sh b/monkey/monkey_island/linux/monkey.sh
index d4ebfedbe..ab03e4798 100644
--- a/monkey/monkey_island/linux/monkey.sh
+++ b/monkey/monkey_island/linux/monkey.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MACHINE_TYPE=`uname -m`
-if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+MACHINE_TYPE=$(uname -m)
+if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
   # 64-bit stuff here
   ARCH=64
 else
@@ -11,4 +11,4 @@ fi
 
 MONKEY_FILE=monkey-linux-$ARCH
 cp -f /var/monkey/monkey_island/cc/binaries/$MONKEY_FILE /tmp
-/tmp/$MONKEY_FILE m0nk3y $@
+/tmp/$MONKEY_FILE m0nk3y "$@"
diff --git a/monkey/monkey_island/linux/run.sh b/monkey/monkey_island/linux/run.sh
index 54e1cdd65..2a5c45bbe 100644
--- a/monkey/monkey_island/linux/run.sh
+++ b/monkey/monkey_island/linux/run.sh
@@ -2,13 +2,13 @@
 
 # Detecting command that calls python 3.7
 python_cmd=""
-if [[ `python --version 2>&1` == *"Python 3.7"* ]]; then
+if [[ $(python --version 2>&1) == *"Python 3.7"* ]]; then
   python_cmd="python"
 fi
-if [[ `python37 --version 2>&1` == *"Python 3.7"* ]]; then
+if [[ $(python37 --version 2>&1) == *"Python 3.7"* ]]; then
   python_cmd="python37"
 fi
-if [[ `python3.7 --version 2>&1` == *"Python 3.7"* ]]; then
+if [[ $(python3.7 --version 2>&1) == *"Python 3.7"* ]]; then
   python_cmd="python3.7"
 fi