diff --git a/.github/workflows/job-build-raspberry-pi.yaml b/.github/workflows/job-build-raspberry-pi.yaml
index 2568c01e90..42027714ac 100644
--- a/.github/workflows/job-build-raspberry-pi.yaml
+++ b/.github/workflows/job-build-raspberry-pi.yaml
@@ -62,7 +62,7 @@ jobs:
         SYNERGY_VERSION_STAGE: ${{ steps.version.outputs.SYNERGY_VERSION_STAGE }}
       run: |
         sed -i "s/ synergy/ ${PACKAGE_NAME}/g" ./debian/control
-        python3 CI/deb_changelog.py "${PACKAGE_NAME}" "$(SYNERGY_DEB_VERSION)"
+        python3 CI/deb_changelog.py "${PACKAGE_NAME}" "${SYNERGY_DEB_VERSION}"
         debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
         mkdir -p package
         cd ..
diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml
index 5ace4781f0..08ec2b09dd 100644
--- a/CI/Linux/linux-build.yml
+++ b/CI/Linux/linux-build.yml
@@ -95,7 +95,7 @@ steps:
     displayName: "Setup variables"
 
   - script: |
-      python3 CI/deb_changelog.py synergy "$(SYNERGY_DEB_VERSION)"
+      python3 CI/deb_changelog.py synergy "${SYNERGY_DEB_VERSION}"
       export GPG_TTY=$(tty)
       debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir standard_package
@@ -115,7 +115,7 @@ steps:
 
   - script: |
       export SYNERGY_ENTERPRISE=1
-      python3 CI/deb_changelog.py synergy-enterprise "$(SYNERGY_DEB_VERSION)"
+      python3 CI/deb_changelog.py synergy-enterprise "${SYNERGY_DEB_VERSION}"
       export GPG_TTY=$(tty)
       debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir enterprise_package
@@ -135,7 +135,7 @@ steps:
 
   - script: |
       export SYNERGY_BUSINESS=1
-      python3 CI/deb_changelog.py synergy-business "$(SYNERGY_DEB_VERSION)"
+      python3 CI/deb_changelog.py synergy-business "${SYNERGY_DEB_VERSION}"
       export GPG_TTY=$(tty)
       debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir business_package
diff --git a/CI/deb_changelog.py b/CI/deb_changelog.py
index a18d642924..5905234958 100644
--- a/CI/deb_changelog.py
+++ b/CI/deb_changelog.py
@@ -12,7 +12,7 @@ if __name__ == '__main__':
   parser.add_argument('-u', '--urgency', type=str, default='low', help='Urgency of the package')
   args = parser.parse_args()
   build_time = datetime.now(timezone.utc).strftime('%a, %d %b %Y %H:%M:%S %z') # day-of-week, dd month yyyy hh:mm:ss +zzzz
-  version_str = re.match('^(\d+.\d+.\d+).*$', args.version).group(1)
+  version_str = re.match('^\d+\.\d+\.\d+', args.version).group(0)
   with open('ChangeLog', 'r', encoding='utf8') as in_file, open('debian/changelog', 'w+', encoding='utf8') as out_file:
     out_file.write('{} ({}) {}; urgency={}\n'.format(args.name, args.version, args.distribution, args.urgency))
     in_section = False
@@ -25,7 +25,8 @@ if __name__ == '__main__':
         elif in_section:
           break
       elif not in_section:
-        continue
+        # skip this line and read in the next
+        pass
       elif line.strip().replace('=', '') == '':
         ignore_segment = False
       elif line.strip() in IGNORE_SEGMENTS:
diff --git a/ChangeLog b/ChangeLog
index c6a82137e0..8d28e1ec79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@ Github Actions:
 - #7156 Change binary storage server
 - #7161 Use brew bundle to install dependencies
 - #7162 Add new distributions to CI
-- #7167 | #7168 Use changelog when creating deb files
+- #7167 | #7168 | #7173 Use changelog when creating deb files
 - #7169 Remove temporary directory when building debs
 ===========