diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index be3afb70..545c1a07 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,18 +1,21 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v3.1.0
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer
-      - id: flake8
 -   repo: https://github.com/psf/black
-    rev: 19.3b0
+    rev: 19.10b0
     hooks:
     -   id: black
         args:
         -   --py36
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.2
+    hooks:
+      - id: flake8
 -   repo: https://github.com/Matterminers/dev-tools
-    rev: "8757635"
+    rev: "87c2435b377bd932acbcc1b619320d98e67b630a"
     hooks:
       -  id: contributors
       -  id: changelog
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index b9a16fd8..8c45241b 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,11 +1,35 @@
 .. Created by changelog.py at 2020-06-03, command
-   '/Users/giffler/.cache/pre-commit/repont7o94ca/py_env-default/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
+   '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-default/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
    based on the format of 'https://keepachangelog.com/'
 
 #########
 CHANGELOG
 #########
 
+[0.4.0] - 2020-06-03
+====================
+
+Added
+-----
+
+* Added an example HTCondor jdl for the HTCondor site adapter
+* Added a prometheus monitoring plugin
+* Enable support for `sbatch` command line options in the Slurm site adapter
+* Add ssh connection sharing to `SSHExecutor` in order to re-use existing connection
+
+Changed
+-------
+
+* Added log channels and adjusted log levels according to the conventions in `COBalD` documentation
+* The Moab adapter can now be configured to use different startup commands for each machine type.
+* The SLURM adapter can now be configured to use different startup commands for each machine type.
+
+Fixed
+-----
+
+* Fixed the exception handling of `ConnectionResetError` in `SSHExecutor`
+* Fixed the resource status translation of the moab site adapter
+
 [0.3.0] - 2020-02-26
 ====================
 
@@ -31,20 +55,3 @@ Fixed
 * Fix the handling of the termination of vanished resources
 * Fix state transitions for jobs retried by HTCondor
 * Fix state transitions and refactoring of the SLURM site adapter
-
-[Unreleased] - 2020-06-03
-=========================
-
-Added
------
-
-* Added an example HTCondor jdl for the HTCondor site adapter
-* Enable support for `sbatch` command line options in the Slurm site adapter
-* Add ssh connection sharing to `SSHExecutor` in order to re-use existing connection
-
-Changed
--------
-
-* Added log channels and adjusted log levels according to the conventions in `COBalD` documentation
-* The Moab adapter can now be configured to use different startup commands for each machine type.
-* The SLURM adapter can now be configured to use different startup commands for each machine type.
diff --git a/docs/source/changes/134.fixed_ssh_executors_exception_handling.yaml b/docs/source/changes/134.fixed_ssh_executors_exception_handling.yaml
new file mode 100644
index 00000000..6663bd3d
--- /dev/null
+++ b/docs/source/changes/134.fixed_ssh_executors_exception_handling.yaml
@@ -0,0 +1,11 @@
+category: fixed
+summary: "Fixed the exception handling of `ConnectionResetError` in `SSHExecutor`"
+description: |
+  The exception handling of the `SSHExecutor` was fixed in order to catch
+  `ConnectionResetError` at the right position. Initially the exception was caught wrongly,
+  which led to crashes of TARDIS.
+issues:
+- 133
+pull requests:
+- 134
+version: 0.4.0
diff --git a/docs/source/changes/138_changed_moved_startupcommand_in_machine_type_configuration.yaml b/docs/source/changes/138_changed_moved_startupcommand_in_machine_type_configuration.yaml
index 463817a8..043ed402 100644
--- a/docs/source/changes/138_changed_moved_startupcommand_in_machine_type_configuration.yaml
+++ b/docs/source/changes/138_changed_moved_startupcommand_in_machine_type_configuration.yaml
@@ -1,9 +1,11 @@
 category: changed
-summary: The SLURM adapter can now be configured to use different startup commands for each machine type.
-pull requests:
-  - 138
-issues:
-  - 136
+summary: "The SLURM adapter can now be configured to use different startup commands\
+  \ for each machine type."
 description: |
   The SLURM adapter can now be configured to use different startup commands for each machine type. The old behaviour of
   providing one startup command is still supported, but will be deprecated in the next major release 0.4.0.
+issues:
+- 136
+pull requests:
+- 138
+version: 0.4.0
diff --git a/docs/source/changes/139_changed_moved_startupcommand_in_machine_type_configuration_moab.yaml b/docs/source/changes/139_changed_moved_startupcommand_in_machine_type_configuration_moab.yaml
index 0a3e52a4..7481901d 100644
--- a/docs/source/changes/139_changed_moved_startupcommand_in_machine_type_configuration_moab.yaml
+++ b/docs/source/changes/139_changed_moved_startupcommand_in_machine_type_configuration_moab.yaml
@@ -1,7 +1,9 @@
 category: changed
-summary: The Moab adapter can now be configured to use different startup commands for each machine type.
-pull requests:
-  - 139
+summary: "The Moab adapter can now be configured to use different startup commands\
+  \ for each machine type."
 description: |
   The Moab adapter can now be configured to use different startup commands for each machine type. The old behaviour of
   providing one startup command is still supported, but will be deprecated in the next major release 0.4.0.
+pull requests:
+- 139
+version: 0.4.0
diff --git a/docs/source/changes/141.fix_moab_adapter_resource_status.yaml b/docs/source/changes/141.fix_moab_adapter_resource_status.yaml
new file mode 100644
index 00000000..6c644e00
--- /dev/null
+++ b/docs/source/changes/141.fix_moab_adapter_resource_status.yaml
@@ -0,0 +1,8 @@
+category: fixed
+summary: "Fixed the resource status translation of the moab site adapter"
+description: |
+  A few moab resource states missing in the resource status translation have been added.
+  In addition, initially wrongly assigned states have been fixed.
+pull requests:
+- 141
+version: 0.4.0
diff --git a/docs/source/changes/142.add_prometheus_plugin.yaml b/docs/source/changes/142.add_prometheus_plugin.yaml
new file mode 100644
index 00000000..2a3ecc2c
--- /dev/null
+++ b/docs/source/changes/142.add_prometheus_plugin.yaml
@@ -0,0 +1,7 @@
+category: added
+summary: "Added a prometheus monitoring plugin"
+description: |
+  Added a new plugin to enable support for prometheus monitoring.
+pull requests:
+- 142
+version: 0.4.0
diff --git a/docs/source/changes/145.add_ssh_connection_sharing.yaml b/docs/source/changes/145.add_ssh_connection_sharing.yaml
index e556827f..060ffc7c 100644
--- a/docs/source/changes/145.add_ssh_connection_sharing.yaml
+++ b/docs/source/changes/145.add_ssh_connection_sharing.yaml
@@ -1,9 +1,11 @@
 category: added
-summary: "Add ssh connection sharing to `SSHExecutor` in order to re-use existing connection"
-pull requests:
-  - 145
-issues:
-  - 135
+summary: "Add ssh connection sharing to `SSHExecutor` in order to re-use existing\
+  \ connection"
 description: |
   The `SSHExector` is now re-using existing connections. Closed connections are automatically reestablished. This will
   avoid connection problems when bothering a remote ssh server with too many requests in too short intervals.
+issues:
+- 135
+pull requests:
+- 145
+version: 0.4.0
diff --git a/docs/source/changes/146.improve_logging.yaml b/docs/source/changes/146.improve_logging.yaml
index 89f7c185..d345cc7b 100644
--- a/docs/source/changes/146.improve_logging.yaml
+++ b/docs/source/changes/146.improve_logging.yaml
@@ -1,9 +1,11 @@
 category: changed
-summary: Added log channels and adjusted log levels according to the conventions in `COBalD` documentation
-pull requests:
-  - 146
-issues:
-  - 137
+summary: "Added log channels and adjusted log levels according to the conventions\
+  \ in `COBalD` documentation"
 description: |
   Added log channels and adjusted log levels according to the conventions in the `COBalD` documentation.
   This will improve the user's ability to filter log messages according their needs.
+issues:
+- 137
+pull requests:
+- 146
+version: 0.4.0
diff --git a/docs/source/changes/150.enable_sbatch_cmdline_options.yaml b/docs/source/changes/150.enable_sbatch_cmdline_options.yaml
index 0d5f2814..06c1cbf4 100644
--- a/docs/source/changes/150.enable_sbatch_cmdline_options.yaml
+++ b/docs/source/changes/150.enable_sbatch_cmdline_options.yaml
@@ -1,9 +1,10 @@
 category: added
 summary: "Enable support for `sbatch` command line options in the Slurm site adapter"
-pull requests:
-  - 150
-issues:
-  - 147
 description: |
   `sbatch` command line option can now be added to the `MachineTypeConfiguration` of the
   Slurm site adapter. `short` and `long` option are supported via yaml MappingNodes.
+issues:
+- 147
+pull requests:
+- 150
+version: 0.4.0
diff --git a/docs/source/changes/151.add_htcondor_example_jdl.yaml b/docs/source/changes/151.add_htcondor_example_jdl.yaml
index e337ad2c..73029dfc 100644
--- a/docs/source/changes/151.add_htcondor_example_jdl.yaml
+++ b/docs/source/changes/151.add_htcondor_example_jdl.yaml
@@ -1,9 +1,10 @@
 category: added
-summary: Added an example HTCondor jdl for the HTCondor site adapter
-pull requests:
-  - 151
-issues:
-  - 132
+summary: "Added an example HTCondor jdl for the HTCondor site adapter"
 description: |
   A example for an HTCondor JDL has been added to the HTCondor site adapter configuration.
   So, that people new to `TARDIS` have a starting point to use this adapter.
+issues:
+- 132
+pull requests:
+- 151
+version: 0.4.0
diff --git a/docs/source/changes/versions.yaml b/docs/source/changes/versions.yaml
index c3b8059f..9f597a50 100644
--- a/docs/source/changes/versions.yaml
+++ b/docs/source/changes/versions.yaml
@@ -1,2 +1,4 @@
+- semver: 0.4.0
+  date: '2020-06-03'
 - semver: 0.3.0
   date: '2020-02-26'
diff --git a/setup.py b/setup.py
index ea25ee98..0874a9de 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
 with open(os.path.join(repo_base_dir, "README.md"), "r") as read_me:
     long_description = read_me.read()
 
-TESTS_REQUIRE = ["aiotools", "flake8"]
+TESTS_REQUIRE = ["flake8"]
 
 setup(
     name=package_about["__package__"],
@@ -57,7 +57,7 @@
         "CloudStackAIO",
         "PyYAML",
         "AsyncOpenStackClient",
-        "cobald>=0.12.0",
+        "cobald>=0.12.1",
         "asyncssh",
         "aiotelegraf",
         "aioprometheus",
diff --git a/tardis/__about__.py b/tardis/__about__.py
index 896682aa..eb2ab998 100644
--- a/tardis/__about__.py
+++ b/tardis/__about__.py
@@ -3,8 +3,8 @@
 __summary__ = "Transparent Adaptive Resource Dynamic Integration System"
 __url__ = "https://github.com/matterminers/tardis"
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 __author__ = "Manuel Giffels, Matthias Schnepf"
 __email__ = "giffels@gmail.com"
-__copyright__ = "2019 %s" % __author__
+__copyright__ = "2018 - 2020 %s and Contributors" % __author__
 __keywords__ = "asyncio tardis cloud scheduler"