diff --git a/changelog.d/20240313_135645_yadudoc1729_update_strategy.rst b/changelog.d/20240313_135645_yadudoc1729_update_strategy.rst
deleted file mode 100644
index dc9101994..000000000
--- a/changelog.d/20240313_135645_yadudoc1729_update_strategy.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Bug Fixes
-^^^^^^^^^
-
-- Fixed a bug in ``GlobusComputeEngine`` where a faulty endpoint-config could result in
-  the endpoint repeatedly submitting jobs to the batch scheduler.  The endpoint will
-  not shut down, reporting the root cause in ``endpoint.log``
-
-- Fixed bug where ``GlobusComputeEngine`` lost track of submitted jobs that failed to
-  have workers connect back. The endpoint will now report a fault if multiple jobs
-  have failed to connect back and shutdown, tasks submitted to the endpoint will
-  return an exception.
-
-Changed
-^^^^^^^
-
-- ``GlobusComputeEngine``'s ``strategy`` kwarg now only accepts ``str``, valid options are
-  ``{'none', 'simple'}`` where ``simple`` is the default.
-- The maximum duration that workers are allowed to idle when using ``GlobusComputeEngine``
-  can now be configured with the new kwarg ``max_idletime`` which accepts a float and defaults
-  to 120s.
diff --git a/changelog.d/20240328_150658_chris_env_var_rename.rst b/changelog.d/20240328_150658_chris_env_var_rename.rst
deleted file mode 100644
index 9d5f71a50..000000000
--- a/changelog.d/20240328_150658_chris_env_var_rename.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-New Functionality
-^^^^^^^^^^^^^^^^^
-
-- Added ``GLOBUS_COMPUTE_CLIENT_ID`` and ``GLOBUS_COMPUTE_CLIENT_SECRET`` environment
-  variables to configure client logins.
-
-
-Deprecated
-^^^^^^^^^^
-
-- ``FUNCX_SDK_CLIENT_ID`` and ``FUNCX_SDK_CLIENT_SECRET`` have been deprecated in favor
-  of their ``GLOBUS_COMPUTE_*`` cousins.
-
diff --git a/compute_endpoint/globus_compute_endpoint/version.py b/compute_endpoint/globus_compute_endpoint/version.py
index ac431d7e1..030fd9ed3 100644
--- a/compute_endpoint/globus_compute_endpoint/version.py
+++ b/compute_endpoint/globus_compute_endpoint/version.py
@@ -1,6 +1,6 @@
 # single source of truth for package version,
 # see https://packaging.python.org/en/latest/single_source_version/
-__version__ = "2.18.0a0"
+__version__ = "2.18.0"
 
 # TODO: remove after a `globus-compute-sdk` release
 # this is needed because it's imported by `globus-compute-sdk` to do the version check
diff --git a/compute_endpoint/setup.py b/compute_endpoint/setup.py
index f9a17f140..f99d6e60e 100644
--- a/compute_endpoint/setup.py
+++ b/compute_endpoint/setup.py
@@ -6,7 +6,7 @@
 REQUIRES = [
     "requests>=2.31.0,<3",
     "globus-sdk",  # version will be bounded by `globus-compute-sdk`
-    "globus-compute-sdk==2.18.0a0",
+    "globus-compute-sdk==2.18.0",
     "globus-compute-common==0.4.1",
     "globus-identity-mapping==0.3.0",
     # table printing used in list-endpoints
diff --git a/compute_sdk/globus_compute_sdk/version.py b/compute_sdk/globus_compute_sdk/version.py
index 262678dd5..235a9c6b1 100644
--- a/compute_sdk/globus_compute_sdk/version.py
+++ b/compute_sdk/globus_compute_sdk/version.py
@@ -3,7 +3,7 @@
 
 # single source of truth for package version,
 # see https://packaging.python.org/en/latest/single_source_version/
-__version__ = "2.18.0a0"
+__version__ = "2.18.0"
 
 
 def compare_versions(
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 90d8d8676..94eb369c3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,6 +3,44 @@ Changelog
 
 .. scriv-insert-here
 
+.. _changelog-2.18.0:
+
+globus-compute-sdk & globus-compute-endpoint v2.18.0
+----------------------------------------------------
+
+New Functionality
+^^^^^^^^^^^^^^^^^
+
+- Added ``GLOBUS_COMPUTE_CLIENT_ID`` and ``GLOBUS_COMPUTE_CLIENT_SECRET`` environment
+  variables to configure client logins.
+
+Bug Fixes
+^^^^^^^^^
+
+- Fixed a bug in ``GlobusComputeEngine`` where a faulty endpoint-config could result in
+  the endpoint repeatedly submitting jobs to the batch scheduler.  The endpoint will
+  not shut down, reporting the root cause in ``endpoint.log``
+
+- Fixed bug where ``GlobusComputeEngine`` lost track of submitted jobs that failed to
+  have workers connect back. The endpoint will now report a fault if multiple jobs
+  have failed to connect back and shutdown, tasks submitted to the endpoint will
+  return an exception.
+
+Deprecated
+^^^^^^^^^^
+
+- ``FUNCX_SDK_CLIENT_ID`` and ``FUNCX_SDK_CLIENT_SECRET`` have been deprecated in favor
+  of their ``GLOBUS_COMPUTE_*`` cousins.
+
+Changed
+^^^^^^^
+
+- ``GlobusComputeEngine``'s ``strategy`` kwarg now only accepts ``str``, valid options are
+  ``{'none', 'simple'}`` where ``simple`` is the default.
+- The maximum duration that workers are allowed to idle when using ``GlobusComputeEngine``
+  can now be configured with the new kwarg ``max_idletime`` which accepts a float and defaults
+  to 120s.
+
 .. _changelog-2.17.0:
 
 globus-compute-sdk & globus-compute-endpoint v2.17.0