diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
index 2bf87f43d59..99ce2539c9d 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
@@ -740,6 +740,6 @@ public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.R
     }
 
     static boolean nodeSupportsJobVersion(Version nodeVersion, Version jobVersion) {
-        return nodeVersion.onOrAfter(Version.V_5_5_0_UNRELEASED);
+        return nodeVersion.onOrAfter(Version.V_5_5_0);
     }
 }
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedState.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedState.java
index f61df3e20d7..45b6d372a0e 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedState.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedState.java
@@ -50,7 +50,7 @@ public enum DatafeedState implements Task.Status {
     public void writeTo(StreamOutput out) throws IOException {
         DatafeedState state = this;
         // STARTING & STOPPING states were introduced in v5.5.
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             if (this == STARTING) {
                 state = STOPPED;
             } else if (this == STOPPING) {
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java
index 84e758f4c35..9181db0c944 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java
@@ -187,7 +187,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent
     public Job(StreamInput in) throws IOException {
         jobId = in.readString();
         jobType = in.readString();
-        if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_5_5_0)) {
             jobVersion = in.readBoolean() ? Version.readVersion(in) : null;
         } else {
             jobVersion = null;
@@ -396,7 +396,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(jobId);
         out.writeString(jobType);
-        if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_5_5_0)) {
             if (jobVersion != null) {
                 out.writeBoolean(true);
                 Version.writeVersion(jobVersion, out);
@@ -613,7 +613,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent
         public Builder(StreamInput in) throws IOException {
             id = in.readOptionalString();
             jobType = in.readString();
-            if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+            if (in.getVersion().onOrAfter(Version.V_5_5_0)) {
                 jobVersion = in.readBoolean() ? Version.readVersion(in) : null;
             }
             description = in.readOptionalString();
@@ -756,7 +756,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent
         public void writeTo(StreamOutput out) throws IOException {
             out.writeOptionalString(id);
             out.writeString(jobType);
-            if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+            if (out.getVersion().onOrAfter(Version.V_5_5_0)) {
                 if (jobVersion != null) {
                     out.writeBoolean(true);
                     Version.writeVersion(jobVersion, out);
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobState.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobState.java
index 8cab15f2cd1..850bf623744 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobState.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobState.java
@@ -37,7 +37,7 @@ public enum JobState implements ToXContent, Writeable {
     public void writeTo(StreamOutput out) throws IOException {
         JobState state = this;
         // Pre v5.5 the OPENING state didn't exist
-        if (this == OPENING && out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (this == OPENING && out.getVersion().before(Version.V_5_5_0)) {
             state = CLOSED;
         }
         out.writeEnum(state);
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AnomalyRecord.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AnomalyRecord.java
index f6d2874473b..3beb0276f9d 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AnomalyRecord.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AnomalyRecord.java
@@ -158,7 +158,7 @@ public class AnomalyRecord extends ToXContentToBytes implements Writeable {
     public AnomalyRecord(StreamInput in) throws IOException {
         jobId = in.readString();
         // bwc for removed sequenceNum field
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             in.readInt();
         }
         detectorIndex = in.readInt();
@@ -196,7 +196,7 @@ public class AnomalyRecord extends ToXContentToBytes implements Writeable {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(jobId);
         // bwc for removed sequenceNum field
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             out.writeInt(0);
         }
         out.writeInt(detectorIndex);
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Bucket.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Bucket.java
index be46ae758c8..f8ed43214ad 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Bucket.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Bucket.java
@@ -122,7 +122,7 @@ public class Bucket extends ToXContentToBytes implements Writeable {
         bucketSpan = in.readLong();
         initialAnomalyScore = in.readDouble();
         // bwc for recordCount
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             in.readInt();
         }
         records = in.readList(AnomalyRecord::new);
@@ -131,7 +131,7 @@ public class Bucket extends ToXContentToBytes implements Writeable {
         bucketInfluencers = in.readList(BucketInfluencer::new);
         processingTimeMs = in.readLong();
         // bwc for perPartitionMaxProbability
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             in.readGenericValue();
         }
         partitionScores = in.readList(PartitionScore::new);
@@ -145,7 +145,7 @@ public class Bucket extends ToXContentToBytes implements Writeable {
         out.writeLong(bucketSpan);
         out.writeDouble(initialAnomalyScore);
         // bwc for recordCount
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             out.writeInt(0);
         }
         out.writeList(records);
@@ -154,7 +154,7 @@ public class Bucket extends ToXContentToBytes implements Writeable {
         out.writeList(bucketInfluencers);
         out.writeLong(processingTimeMs);
         // bwc for perPartitionMaxProbability
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             out.writeGenericValue(Collections.emptyMap());
         }
         out.writeList(partitionScores);
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/BucketInfluencer.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/BucketInfluencer.java
index b1743875c06..062afbaa1b2 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/BucketInfluencer.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/BucketInfluencer.java
@@ -100,7 +100,7 @@ public class BucketInfluencer extends ToXContentToBytes implements Writeable {
         timestamp = new Date(in.readLong());
         bucketSpan = in.readLong();
         // bwc for removed sequenceNum field
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             in.readInt();
         }
     }
@@ -117,7 +117,7 @@ public class BucketInfluencer extends ToXContentToBytes implements Writeable {
         out.writeLong(timestamp.getTime());
         out.writeLong(bucketSpan);
         // bwc for removed sequenceNum field
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             out.writeInt(0);
         }
     }
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Influencer.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Influencer.java
index 945e20502de..de64a93f90b 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Influencer.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Influencer.java
@@ -100,7 +100,7 @@ public class Influencer extends ToXContentToBytes implements Writeable {
         isInterim = in.readBoolean();
         bucketSpan = in.readLong();
         // bwc for removed sequenceNum field
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             in.readInt();
         }
     }
@@ -117,7 +117,7 @@ public class Influencer extends ToXContentToBytes implements Writeable {
         out.writeBoolean(isInterim);
         out.writeLong(bucketSpan);
         // bwc for removed sequenceNum field
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             out.writeInt(0);
         }
     }
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/ModelPlot.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/ModelPlot.java
index f6b10f5194e..0b7c9c768e0 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/ModelPlot.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/ModelPlot.java
@@ -98,7 +98,7 @@ public class ModelPlot extends ToXContentToBytes implements Writeable {
     public ModelPlot(StreamInput in) throws IOException {
         jobId = in.readString();
         // timestamp isn't optional in v5.5
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             if (in.readBoolean()) {
                 timestamp = new Date(in.readLong());
             } else {
@@ -108,7 +108,7 @@ public class ModelPlot extends ToXContentToBytes implements Writeable {
             timestamp = new Date(in.readLong());
         }
         // bwc for removed id field
-        if (in.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_5_5_0)) {
             in.readOptionalString();
         }
         partitionFieldName = in.readOptionalString();
@@ -122,7 +122,7 @@ public class ModelPlot extends ToXContentToBytes implements Writeable {
         modelUpper = in.readDouble();
         modelMedian = in.readDouble();
         actual = in.readDouble();
-        if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_5_5_0)) {
             bucketSpan = in.readLong();
         } else {
             bucketSpan = 0;
@@ -133,7 +133,7 @@ public class ModelPlot extends ToXContentToBytes implements Writeable {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(jobId);
         // timestamp isn't optional in v5.5
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             boolean hasTimestamp = timestamp != null;
             out.writeBoolean(hasTimestamp);
             if (hasTimestamp) {
@@ -143,7 +143,7 @@ public class ModelPlot extends ToXContentToBytes implements Writeable {
             out.writeLong(timestamp.getTime());
         }
         // bwc for removed id field
-        if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_5_5_0)) {
             out.writeOptionalString(null);
         }
         out.writeOptionalString(partitionFieldName);
@@ -157,7 +157,7 @@ public class ModelPlot extends ToXContentToBytes implements Writeable {
         out.writeDouble(modelUpper);
         out.writeDouble(modelMedian);
         out.writeDouble(actual);
-        if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_5_5_0)) {
             out.writeLong(bucketSpan);
         }
     }
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java b/plugin/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
index 8f4ba321a42..def4e140a43 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
@@ -216,7 +216,7 @@ public final class TokenService extends AbstractComponent {
         } else {
             // the token exists and the value is at least as long as we'd expect
             final Version version = Version.readVersion(in);
-            if (version.before(Version.V_5_5_0_UNRELEASED)) {
+            if (version.before(Version.V_5_5_0)) {
                 listener.onResponse(null);
             } else {
                 final BytesKey decodedSalt = new BytesKey(in.readByteArray());
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigrator.java b/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigrator.java
index 1420818abf7..21dcb4af39d 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigrator.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigrator.java
@@ -151,7 +151,7 @@ public class NativeRealmMigrator implements IndexLifecycleManager.IndexDataMigra
      * does the right thing.
      */
     private boolean shouldConvertDefaultPasswords(@Nullable Version previousVersion) {
-        return previousVersion != null && previousVersion.before(Version.V_6_0_0_alpha1_UNRELEASED);
+        return previousVersion != null && previousVersion.before(Version.V_6_0_0_alpha1);
     }
 
     @SuppressWarnings("unused")
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/user/BeatsSystemUser.java b/plugin/src/main/java/org/elasticsearch/xpack/security/user/BeatsSystemUser.java
index 6e9cef9f832..fc0399a5ab2 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/security/user/BeatsSystemUser.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/security/user/BeatsSystemUser.java
@@ -11,7 +11,7 @@ import org.elasticsearch.xpack.security.support.MetadataUtils;
 public class BeatsSystemUser extends User {
     public static final String NAME = "beats_system";
     private static final String ROLE_NAME = "beats_system";
-    public static final Version DEFINED_SINCE = Version.V_6_0_0_alpha1_UNRELEASED;
+    public static final Version DEFINED_SINCE = Version.V_6_0_0_alpha1;
     public static final BuiltinUserInfo USER_INFO = new BuiltinUserInfo(NAME, ROLE_NAME, DEFINED_SINCE);
 
     public BeatsSystemUser(boolean enabled) {
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java
index d66f994ce6d..4b50d2e7fae 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java
@@ -92,7 +92,7 @@ public class WatcherStatsResponse extends BaseNodesResponse<WatcherStatsResponse
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             super.readFrom(in);
             watcherMetaData = new WatcherMetaData(in.readBoolean());
         } else {
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedStateTests.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedStateTests.java
index 2e15dd0af02..0547297fe69 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedStateTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedStateTests.java
@@ -61,7 +61,7 @@ public class DatafeedStateTests extends ESTestCase {
         assertEquals(DatafeedState.STARTED, enumCaptor.getValue());
 
         // POST 5.5 enums a written as is
-        when(out.getVersion()).thenReturn(Version.V_5_5_0_UNRELEASED);
+        when(out.getVersion()).thenReturn(Version.V_5_5_0);
 
         DatafeedState.STARTING.writeTo(out);
         assertEquals(DatafeedState.STARTING, enumCaptor.getValue());
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobStateTests.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobStateTests.java
index a71d9f60143..0a827fc335a 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobStateTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobStateTests.java
@@ -79,7 +79,7 @@ public class JobStateTests extends ESTestCase {
         JobState.OPENING.writeTo(out);
         assertEquals(JobState.CLOSED, enumCaptor.getValue());
 
-        when(out.getVersion()).thenReturn(Version.V_5_5_0_UNRELEASED);
+        when(out.getVersion()).thenReturn(Version.V_5_5_0);
 
         doAnswer(new Answer<Void>() {
             @Override
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java
index bb0085866ad..0406b62e4f3 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java
@@ -399,8 +399,8 @@ public class JobTests extends AbstractSerializingTestCase<Job> {
     public void testGetCompatibleJobTypes_givenVersionAfter_V_5_4() {
         assertThat(Job.getCompatibleJobTypes(Version.V_5_4_0), contains(Job.ANOMALY_DETECTOR_JOB_TYPE));
         assertThat(Job.getCompatibleJobTypes(Version.V_5_4_0).size(), equalTo(1));
-        assertThat(Job.getCompatibleJobTypes(Version.V_5_5_0_UNRELEASED), contains(Job.ANOMALY_DETECTOR_JOB_TYPE));
-        assertThat(Job.getCompatibleJobTypes(Version.V_5_5_0_UNRELEASED).size(), equalTo(1));
+        assertThat(Job.getCompatibleJobTypes(Version.V_5_5_0), contains(Job.ANOMALY_DETECTOR_JOB_TYPE));
+        assertThat(Job.getCompatibleJobTypes(Version.V_5_5_0).size(), equalTo(1));
     }
 
     public static Job.Builder buildJobBuilder(String id, Date date) {
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigratorTests.java b/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigratorTests.java
index 2aa6ef66f2a..a6c7e7eecfb 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigratorTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmMigratorTests.java
@@ -155,7 +155,7 @@ public class NativeRealmMigratorTests extends ESTestCase {
     }
 
     public void testNoChangeOnUpgradeAfterV5_3() throws Exception {
-        verifyUpgrade(randomFrom(Version.V_6_0_0_alpha1_UNRELEASED), null, false);
+        verifyUpgrade(randomFrom(Version.V_6_0_0_alpha1), null, false);
     }
 
     public void testDisableLogstashBeatsAndConvertPasswordsOnUpgradeFromVersionPriorToV5_2() throws Exception {
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java b/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java
index d9e5c17b529..9e75b1f2d6b 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java
@@ -369,6 +369,6 @@ public class ReservedRealmTests extends ESTestCase {
                 assertThat(versionPredicate.test(Version.V_5_2_0), is(true));
                 break;
         }
-        assertThat(versionPredicate.test(Version.V_6_0_0_alpha1_UNRELEASED), is(true));
+        assertThat(versionPredicate.test(Version.V_6_0_0_alpha1), is(true));
     }
 }