diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60bccdeb..ce4b85a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.4.18 - 2022-06-02
+### Fixed
+*   Fixed various database related access issues steming from running multiple instances of the application at the same time using the same configuration data
+*   Fixed --display-config being impacted by --resync flag
+*   Fixed installation permissions for onedrive man-pages file
+*   Fixed that in some situations that users try --upload-only and --download-only together which is not possible
+*   Fixed application crash if unable to read required hash files
+
+### Added
+*   Added Feature Request to add an override for skip_dir|skip_file through flag to force sync
+*   Added a check to validate local filesystem available space before attempting file download
+*   Added GitHub Actions to build Docker containers and push to DockerHub 
+
+### Updated
+*   Updated all Docker build files to current distributions, using updated distribution LDC version
+*   Updated logging output to logfiles when an actual sync process is occuring
+*   Updated output of --display-config to be more relevant
+*   Updated manpage to align with application configuration
+*   Updated documentation and Docker files based on minimum compiler versions to dmd-2.088.0 and ldc-1.18.0
+*   Updated documentation (various)
+
 ## 2.4.17 - 2022-04-30
 ### Fixed
 *   Fix docker build, by add missing git package for Fedora builds
diff --git a/configure b/configure
index 11f900a2..d7aae13b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for onedrive v2.4.18-dev.
+# Generated by GNU Autoconf 2.69 for onedrive v2.4.18.
 #
 # Report bugs to <https://github.com/abraunegg/onedrive>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='onedrive'
 PACKAGE_TARNAME='onedrive'
-PACKAGE_VERSION='v2.4.18-dev'
-PACKAGE_STRING='onedrive v2.4.18-dev'
+PACKAGE_VERSION='v2.4.18'
+PACKAGE_STRING='onedrive v2.4.18'
 PACKAGE_BUGREPORT='https://github.com/abraunegg/onedrive'
 PACKAGE_URL=''
 
@@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onedrive v2.4.18-dev to adapt to many kinds of systems.
+\`configure' configures onedrive v2.4.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1280,7 +1280,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onedrive v2.4.18-dev:";;
+     short | recursive ) echo "Configuration of onedrive v2.4.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1393,7 +1393,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-onedrive configure v2.4.18-dev
+onedrive configure v2.4.18
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1410,7 +1410,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onedrive $as_me v2.4.18-dev, which was
+It was created by onedrive $as_me v2.4.18, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2162,7 +2162,7 @@ fi
 
 
 
-PACKAGE_DATE="May 2022"
+PACKAGE_DATE="June 2022"
 
 
 
@@ -3159,7 +3159,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by onedrive $as_me v2.4.18-dev, which was
+This file was extended by onedrive $as_me v2.4.18, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3212,7 +3212,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-onedrive config.status v2.4.18-dev
+onedrive config.status v2.4.18
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 875b62d4..c71750f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl - commit the changed files (configure.ac, configure)
 dnl - tag the release
 
 AC_PREREQ([2.69])
-AC_INIT([onedrive],[v2.4.18-dev], [https://github.com/abraunegg/onedrive], [onedrive])
+AC_INIT([onedrive],[v2.4.18], [https://github.com/abraunegg/onedrive], [onedrive])
 AC_CONFIG_SRCDIR([src/main.d])
 
 
diff --git a/contrib/gentoo/onedrive-2.4.17.ebuild b/contrib/gentoo/onedrive-2.4.18.ebuild
similarity index 100%
rename from contrib/gentoo/onedrive-2.4.17.ebuild
rename to contrib/gentoo/onedrive-2.4.18.ebuild
diff --git a/contrib/spec/onedrive.spec.in b/contrib/spec/onedrive.spec.in
index 2d147e3a..6fb4ae07 100644
--- a/contrib/spec/onedrive.spec.in
+++ b/contrib/spec/onedrive.spec.in
@@ -6,7 +6,7 @@
 %endif
 
 Name:       onedrive
-Version:    2.4.17
+Version:    2.4.18
 Release:    1%{?dist}
 Summary:    Microsoft OneDrive Client
 Group:      System Environment/Network