diff --git a/CHANGELOG.md b/CHANGELOG.md
index f700a6f3c..28754b6a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.23.0] - 2023-05-23
+
 ### Added
 
 - query-all-size-info API to query-size-info for all currently available resource groups
diff --git a/Dockerfile.controller b/Dockerfile.controller
index 62355716b..3b0eba710 100644
--- a/Dockerfile.controller
+++ b/Dockerfile.controller
@@ -1,7 +1,7 @@
 ARG BUILDER=registry.access.redhat.com/ubi8/ubi
 FROM $BUILDER as builder
 
-ENV LINSTOR_VERSION 1.22.1
+ENV LINSTOR_VERSION 1.23.0
 
 ENV LINSTOR_TGZNAME linstor-server
 ENV LINSTOR_TGZ ${LINSTOR_TGZNAME}-${LINSTOR_VERSION}.tar.gz
@@ -49,7 +49,7 @@ MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 RUN echo "skip_missing_names_on_install=no" >> /etc/yum.conf
 
 # ENV can not be shared between builder and "main"
-ENV LINSTOR_VERSION 1.22.1
+ENV LINSTOR_VERSION 1.23.0
 ARG release=1
 
 LABEL name="linstor-controller" \
diff --git a/Dockerfile.satellite b/Dockerfile.satellite
index 206ac9efb..c1ebd979c 100644
--- a/Dockerfile.satellite
+++ b/Dockerfile.satellite
@@ -1,7 +1,7 @@
 ARG BUILDER=registry.access.redhat.com/ubi8/ubi
 FROM $BUILDER as builder
 
-ENV LINSTOR_VERSION 1.22.1
+ENV LINSTOR_VERSION 1.23.0
 ARG ARCH=amd64
 
 ENV LINSTOR_TGZNAME linstor-server
@@ -50,7 +50,7 @@ RUN cd ${HOME}/${LINSTOR_TGZNAME}-${LINSTOR_VERSION} && \
 FROM quay.io/linbit/drbd-utils
 # this is/needs to be based on registry.access.redhat.com/ubi7/ubi
 
-ENV LINSTOR_VERSION 1.22.1
+ENV LINSTOR_VERSION 1.23.0
 ARG release=1
 ARG ARCH=amd64
 
diff --git a/debian/changelog b/debian/changelog
index fd0d2077b..47074b55b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+linstor-server (1.23.0-1) experimental; urgency=medium
+
+  [ Moritz "WanzenBug" Wanzenböck ]
+  * docker: fix migration script
+  * drbd: quote hostnames
+
+  [ Joel Colledge ]
+  * containers: add basic administrative tools to the satellite image
+
+  [ Gabor Hernadi ]
+  * NodeCon: Fix NPE on stlt startup
+  * MkAvail: Fix incorrect deletion of TIE_BREAKER flags
+  * Sos,Log: Fixed logging and collecting logs
+  * K8s,Etcd: Synchronize commit and rollback
+  * ApiCall,offline: Fix offline handling
+  * SharedSPName: Allow digits as first character
+  * Rsc,Delete: Prevent possible NPE
+  * Rsc,del: Fix tiebreaker-takeover issue
+  * QueryAllSizeInfo: New API to run qsi for all existing RGs
+  * Qsi,Qasi: Add cache
+  * DevMgr: Reduce disc_gran retry count to 10
+  * Clone: Disable layers when cloning
+  * SpaceInfo: throw exception if sp is broken
+
+  [ Rene Peinthor ]
+  * sos-report: have a parent directory for the tar.gz file
+  * ctrlconfapih: wait for satellite property updates (flux)
+  * auto-verify-algo: remove/ignore auto-verify-algo prop if disabled
+
+  [ Johanna Kucera ]
+  * Transactions: prevent AccessToDeletedDataException in transMgr
+
+ -- Rene Peinthor <rene.peinthor@linbit.com>  Tue, 23 May 2023 06:25:30 +0000
+
 linstor-server (1.22.1-1) experimental; urgency=medium
 
   [ Franciosi ]
diff --git a/docs/rest_v1_openapi.yaml b/docs/rest_v1_openapi.yaml
index 74f8240cb..3a937432d 100644
--- a/docs/rest_v1_openapi.yaml
+++ b/docs/rest_v1_openapi.yaml
@@ -21,7 +21,7 @@ info:
 
     Changelog:
 
-    * unreleased
+    * 1.19.0
       - Added POST /v1/view/resource-groups/query-all-size-info
       - Added QueryAllSizeInfoRequest and QueryAllSizeInfoResponse objects
     * 1.18.0
diff --git a/linstor.spec b/linstor.spec
index 57a36b5ce..ea3b0f3b4 100644
--- a/linstor.spec
+++ b/linstor.spec
@@ -1,5 +1,5 @@
 Name: linstor
-Version: 1.22.1
+Version: 1.23.0
 Release: 1%{?dist}
 Summary: LINSTOR SDS
 BuildArch: noarch
@@ -144,6 +144,9 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || :
 %systemd_preun linstor-satellite.service
 
 %changelog
+* Tue May 23 2023 Rene Peinthor <rene.peinthor@linbit.com> 1.23.0-1
+- New upstream release. Bug fixes
+
 * Thu Apr 27 2023 Rene Peinthor <rene.peinthor@linbit.com> 1.22.1-1
 - New upstream release. Bug fixes