diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22a2e57d5bba21f6f36f2de4c1ac322bd9c71b51..65f7ed580191eb65d78abbfd6a45011e6ee6f12b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,8 +74,8 @@ pre-commit:
     # Create the environment and install DIRAC+LHCbDIRAC
     # We take the environment from the branch and not the release
     # to not depend on a release to change the dependencies.
-    - git checkout ${diracBranch} -- environment-py3.yml
-    - mamba env create --file environment-py3.yml --name test-env
+    - git checkout ${diracBranch} -- environment.yml
+    - mamba env create --file environment.yml --name test-env
     - conda activate test-env
     - pip install .[server]
     - cd ../LHCbDIRAC
@@ -105,8 +105,6 @@ check_docs:
     - cd docs
     # We need to export the DIRAC env variable so that the makefile knows where to find the documentation tools
     - export DIRACDOCTOOLS=$(dirname $(python -c "import diracdoctools; print(diracdoctools.__file__)"))
-    # Remove  numpy from DIRAC_DOC_MOCK_LIST as uproot fails to import without it
-    - sed -i "s@'numpy',@@" "${DIRACDOCTOOLS}/__init__.py"
     - SPHINXOPTS=-wsphinxWarnings make htmlall || { echo "Failed to build documentation, check for errors above" ; exit 1; }
     # Check that sphinxWarnings is not empty
     - >
@@ -116,6 +114,7 @@ check_docs:
         echo "********************************************************************************"
         cat sphinxWarnings
         echo "********************************************************************************"
+        cat source/Commands/index.rst
         exit 1
       fi
   only:
@@ -145,7 +144,7 @@ integration_tests:
   parallel:
     matrix:
       - TEST_COMMAND:
-          - python3 ./integration_tests.py create "LHCBDIRAC_RELEASE=$${lhcbdiracTag}" USE_PYTHON3=Yes --extra-module LHCbDIRAC=../LHCbDIRAC
+          - python3 ./integration_tests.py create "LHCBDIRAC_RELEASE=$${lhcbdiracTag}" --extra-module LHCbDIRAC=../LHCbDIRAC
   before_script:
     # Install dependencies
     - apk add docker py3-pip python3 bash git docker-compose jq curl
diff --git a/setup.cfg b/setup.cfg
index ef8a996d218962a904ede857c2256f144ec04355..ee64d887cede47d32c06017f7f668189d321fc82 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,7 @@ package_dir=
     =src
 packages = find:
 install_requires =
-    DIRAC ~= 7.3.0
+    DIRAC ~= 8.0.0a0
     LbPlatformUtils
     LbEnv
     LbProdRun
diff --git a/src/LHCbDIRAC/Core/scripts/install_oracle-client.sh b/src/LHCbDIRAC/Core/scripts/install_oracle-client.sh
deleted file mode 100755
index cd0b3ef3c19e36cf0daa694a66f73359d5553799..0000000000000000000000000000000000000000
--- a/src/LHCbDIRAC/Core/scripts/install_oracle-client.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-###############################################################################
-# (c) Copyright 2019 CERN for the benefit of the LHCb Collaboration           #
-#                                                                             #
-# This software is distributed under the terms of the GNU General Public      #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "LICENSE".   #
-#                                                                             #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization  #
-# or submit itself to any jurisdiction.                                       #
-###############################################################################
-# Install Oracle client module on a CERN vobox machine
-#
-pip install --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --trusted-host pypi.org cx_Oracle==7.3
-#
-exit 0
diff --git a/src/LHCbDIRAC/TransformationSystem/scripts/dirac_production_set_runs.py b/src/LHCbDIRAC/TransformationSystem/scripts/dirac_production_set_runs.py
index c19e47baf50beb94863c29bbabf2ee763030bf09..aa1cb177d11c126739b5bb116722ba17f4c2d1fc 100755
--- a/src/LHCbDIRAC/TransformationSystem/scripts/dirac_production_set_runs.py
+++ b/src/LHCbDIRAC/TransformationSystem/scripts/dirac_production_set_runs.py
@@ -35,24 +35,24 @@ def main():
     from DIRAC.Core.Base import Script
 
     Script.setUsageMessage(
-        __doc__
-        + "\n".join(
-            [
-                "Usage:",
-                "  %s [option|cfgfile] ... Prod -Option [RunNumber|RunList]" % Script.scriptName,
-                "Arguments:",
-                "  Prod:      DIRAC Production Id",
-                "  RunNumber: New Start or End run",
-                "  RunList: List of Runs to be added",
-                "Examples:\n",
-                "dirac-production-set-run.py 92 --List                        (show the list of runs for transformation 92)\n",
-                "dirac-production-set-run.py 92 --AddRuns 98200,98201             (add some discrete run to transformation 92)\n",
-                "dirac-production-set-run.py 92 --AddRuns 98200,98201,99000:99100 (add some discrete run and\
-         a range of runs to transformation 92)\n",
-                "dirac-production-set-run.py 92 --StartRun 98200                 (change the start run for transformation 92)\n",
-                "dirac-production-set-run.py 92 --EndRun   98200                 (change the end run  for transformation 92)\n",
-            ]
-        )
+        f"{__doc__}"
+        f"Usage:\n"
+        f"  {Script.scriptName} [option|cfgfile] ... Prod -Option [RunNumber|RunList]\n"
+        "Arguments:\n"
+        "  Prod:      DIRAC Production Id\n"
+        "  RunNumber: New Start or End run\n"
+        "  RunList: List of Runs to be added\n"
+        "Examples:\n"
+        "  # show the list of runs for transformation 92\n"
+        "  dirac-production-set-run.py 92 --List\n"
+        "  # add some discrete run to transformation 92\n"
+        "  dirac-production-set-run.py 92 --AddRuns 98200,98201\n"
+        "  # add some discrete run and a range of runs to transformation 92\n"
+        "  dirac-production-set-run.py 92 --AddRuns 98200,98201,99000:99100\n"
+        "  # change the start run for transformation 92\n"
+        "  dirac-production-set-run.py 92 --StartRun 98200\n"
+        "  # change the end run  for transformation 92\n"
+        "  dirac-production-set-run.py 92 --EndRun   98200\n"
     )
 
     Script.registerSwitch("", "EndRun=", "Specify endrun for the transformation")