diff --git a/assets/setup/install.sh b/assets/setup/install.sh
index eb1c59df..dfb0a84b 100755
--- a/assets/setup/install.sh
+++ b/assets/setup/install.sh
@@ -83,10 +83,6 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then
 fi
 sudo -HEu ${GITLAB_USER} bundle install -j$(nproc) --deployment --without development test aws
 
-# GitLab 8.1.0 dropped whenever from their Gemfile
-# https://github.com/gitlabhq/gitlabhq/commit/6f79b5336fb9ac011dd19d5720b8bfda8b6fa53a
-gem install whenever
-
 # make sure everything in ${GITLAB_HOME} is owned by the git user
 chown -R ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_HOME}/
 
@@ -94,9 +90,6 @@ chown -R ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_HOME}/
 echo "Compiling assets. Please be patient, this could take a while..."
 sudo -HEu ${GITLAB_USER} bundle exec rake assets:clean assets:precompile >/dev/null 2>&1
 
-# install schedules cronjob
-sudo -HEu ${GITLAB_USER} whenever -w
-
 # symlink log -> ${GITLAB_LOG_DIR}/gitlab
 rm -rf log
 ln -sf ${GITLAB_LOG_DIR}/gitlab log
diff --git a/entrypoint.sh b/entrypoint.sh
index dcc573a3..7a551a3d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -941,7 +941,6 @@ appInit () {
   case ${GITLAB_BACKUPS} in
     daily|weekly|monthly)
       read hour min <<< ${GITLAB_BACKUP_TIME//[:]/ }
-      crontab -u ${GITLAB_USER} -l > /tmp/cron.${GITLAB_USER}
       case ${GITLAB_BACKUPS} in
         daily)
           sudo -HEu ${GITLAB_USER} cat >> /tmp/cron.${GITLAB_USER} <<EOF