diff --git a/Dockerfile b/Dockerfile
index 8e995e5..3dd5461 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02apt-speedup &&\
     rm -r /var/www/html && \
     rm -rf /tmp/*
 
-RUN git clone -b media --single-branch https://github.com/spotweb/spotweb.git /var/www/spotweb && \
+RUN git clone -b master --single-branch https://github.com/spotweb/spotweb.git /var/www/spotweb && \
     rm -rf /var/www/spotweb/.git && \
     chmod -R 775 /var/www/spotweb && \
     chown -R www-data:www-data /var/www/spotweb
diff --git a/entrypoint.sh b/entrypoint.sh
index 6ce28a6..9f581ff 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -f /config/dbsettings.inc.php ]; then
 	ln -s /config/dbsettings.inc.php /var/www/spotweb/dbsettings.inc.php
 
 	# Run database update
-	/usr/bin/php /var/www/spotweb/upgrade-db.php
+	/usr/bin/php /var/www/spotweb/bin/upgrade-db.php
 else
 	echo -e "\nWARNING: You have no database configuration file, either create /config/dbsettings.inc.php or restart this container with the correct environment variables to auto generate the config.\n"
 fi
@@ -36,4 +36,4 @@ sed -i "s#^;date.timezone =.*#date.timezone = ${TZ}#g" /etc/php5/*/php.ini
 # Enabling PHP mod rewrite
 /usr/sbin/a2enmod rewrite && /etc/init.d/apache2 restart
 
-tail -F /var/log/apache2/*
\ No newline at end of file
+tail -F /var/log/apache2/*