diff --git a/main.go b/main.go
index 2c66eeda7..426f9ea2e 100644
--- a/main.go
+++ b/main.go
@@ -365,6 +365,10 @@ func advertiseFeatureLabels(helper APIHelpers, labels Labels, annotations Annota
 
 	// Remove labels with our prefix
 	helper.RemoveLabels(node, labelPrefix)
+	// Also, remove all labels with the old prefix, and the old version label
+	helper.RemoveLabels(node, "node.alpha.kubernetes-incubator.io/nfd")
+	helper.RemoveLabels(node, "node.alpha.kubernetes-incubator.io/node-feature-discovery")
+
 	// Add labels to the node object.
 	helper.AddLabels(node, labels)
 
diff --git a/main_test.go b/main_test.go
index d8016389a..d864a3492 100644
--- a/main_test.go
+++ b/main_test.go
@@ -68,6 +68,8 @@ func TestDiscoveryWithMockSources(t *testing.T) {
 			mockAPIHelper.On("GetNode", mockClient).Return(mockNode, nil).Once()
 			mockAPIHelper.On("AddLabels", mockNode, fakeFeatureLabels).Return().Once()
 			mockAPIHelper.On("RemoveLabels", mockNode, labelPrefix).Return().Once()
+			mockAPIHelper.On("RemoveLabels", mockNode, "node.alpha.kubernetes-incubator.io/nfd").Return().Once()
+			mockAPIHelper.On("RemoveLabels", mockNode, "node.alpha.kubernetes-incubator.io/node-feature-discovery").Return().Once()
 			mockAPIHelper.On("AddAnnotations", mockNode, fakeAnnotations).Return().Once()
 			mockAPIHelper.On("UpdateNode", mockClient, mockNode).Return(nil).Once()
 			noPublish := false
@@ -115,6 +117,8 @@ func TestDiscoveryWithMockSources(t *testing.T) {
 			mockAPIHelper.On("GetClient").Return(mockClient, nil)
 			mockAPIHelper.On("GetNode", mockClient).Return(mockNode, nil).Once()
 			mockAPIHelper.On("RemoveLabels", mockNode, labelPrefix).Return().Once()
+			mockAPIHelper.On("RemoveLabels", mockNode, "node.alpha.kubernetes-incubator.io/nfd").Return().Once()
+			mockAPIHelper.On("RemoveLabels", mockNode, "node.alpha.kubernetes-incubator.io/node-feature-discovery").Return().Once()
 			mockAPIHelper.On("AddLabels", mockNode, fakeFeatureLabels).Return().Once()
 			mockAPIHelper.On("AddAnnotations", mockNode, fakeAnnotations).Return().Once()
 			mockAPIHelper.On("UpdateNode", mockClient, mockNode).Return(expectedError).Once()