diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab27cbc9..b54ba730 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,18 +10,24 @@ The format is based on [Keep a Changelog], and this project adheres to
 
 ## [Unreleased]
 
+[Unreleased]: https://github.com/envato/stack_master/compare/v2.18.0...HEAD
+
+## [2.18.0] - 2026-02-02
+
 ### Changed
 
 - Improve message when CloudFormation claims there are no changes to apply, even when a template diff is present. ([#398])
 - Display Tags diff (stack tags) in `stack_master diff` and `stack_master apply` commands. ([#397])
 - Resolve style issues identified by RuboCop. ([#396])
 - Test on Ruby 4.0 in the CI build ([#399]).
+- Minor fixups in gem metadata ([#400]).
 
-[Unreleased]: https://github.com/envato/stack_master/compare/v2.17.1...HEAD
+[2.18.0]: https://github.com/envato/stack_master/compare/v2.17.1...v2.18.0
 [#396]: https://github.com/envato/stack_master/pull/396
 [#397]: https://github.com/envato/stack_master/pull/397
 [#398]: https://github.com/envato/stack_master/pull/398
 [#399]: https://github.com/envato/stack_master/pull/399
+[#400]: https://github.com/envato/stack_master/pull/400
 
 ## [2.17.1] - 2025-12-19
 
diff --git a/README.md b/README.md
index 901fae7f..a1381e38 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![License MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/envato/stack_master/blob/master/LICENSE.md)
 [![Gem Version](https://badge.fury.io/rb/stack_master.svg)](https://badge.fury.io/rb/stack_master)
-[![Build Status](https://github.com/envato/stack_master/workflows/tests/badge.svg?branch=master)](https://github.com/envato/stack_master/actions?query=workflow%3Atests+branch%3Amaster)
+[![Build Status](https://github.com/envato/stack_master/actions/workflows/test.yml/badge.svg)](https://github.com/envato/stack_master/actions/workflows/test.yml)
 
 StackMaster is a CLI tool to manage [CloudFormation](https://aws.amazon.com/cloudformation/) stacks, with the following features:
 
diff --git a/lib/stack_master/version.rb b/lib/stack_master/version.rb
index 1b60eb38..0df12b94 100644
--- a/lib/stack_master/version.rb
+++ b/lib/stack_master/version.rb
@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = '2.17.1'
+  VERSION = '2.18.0'
 end
diff --git a/stack_master.gemspec b/stack_master.gemspec
index 02cd5a27..42544265 100644
--- a/stack_master.gemspec
+++ b/stack_master.gemspec
@@ -11,13 +11,14 @@ Gem::Specification.new do |spec|
   spec.summary       = 'StackMaster is a sure-footed way of creating, updating and keeping track ' \
                        'of Amazon (AWS) CloudFormation stacks.'
   spec.description   = ''
-  spec.homepage      = 'https://opensource.envato.com/projects/stack_master.html'
+  spec.homepage      = "https://github.com/envato/#{spec.name}"
   spec.license       = 'MIT'
   spec.metadata      = {
-    'bug_tracker_uri' => 'https://github.com/envato/stack_master/issues',
-    'changelog_uri' => 'https://github.com/envato/stack_master/blob/master/CHANGELOG.md',
-    'documentation_uri' => "https://www.rubydoc.info/gems/stack_master/#{spec.version}",
-    'source_code_uri' => "https://github.com/envato/stack_master/tree/v#{spec.version}"
+    'allowed_push_host' => 'https://rubygems.org',
+    'bug_tracker_uri' => "#{spec.homepage}/issues",
+    'changelog_uri' => "#{spec.homepage}/blob/master/CHANGELOG.md",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}",
+    'source_code_uri' => "#{spec.homepage}/tree/v#{spec.version}"
   }
 
   spec.files         = Dir.glob('{bin,lib,stacktemplates}/**/*') + %w[README.md LICENSE.txt]