diff --git a/rules/S2259/java/metadata.json b/rules/S2259/java/metadata.json
index 68b7c52b3be..fc5e17dd918 100644
--- a/rules/S2259/java/metadata.json
+++ b/rules/S2259/java/metadata.json
@@ -1,9 +1,6 @@
 {
-  "tags": [
-    "cwe",
-    "cert",
-    "symbolic-execution"
-  ],
+  "status": "deprecated",
+  "tags": [],
   "securityStandards": {
     "CERT": [
       "EXP34-C.",
@@ -12,5 +9,11 @@
     "CWE": [
       476
     ]
+  },
+  "defaultQualityProfiles": [],
+  "extra": {
+    "replacementRules": [
+      "RSPEC-6555"
+    ]
   }
 }
diff --git a/rules/S2583/java/metadata.json b/rules/S2583/java/metadata.json
index adc8a2b0762..bd2a758b0be 100644
--- a/rules/S2583/java/metadata.json
+++ b/rules/S2583/java/metadata.json
@@ -1,12 +1,6 @@
 {
-  "tags": [
-    "cwe",
-    "cert",
-    "unused",
-    "suspicious",
-    "pitfall",
-    "symbolic-execution"
-  ],
+  "status": "deprecated",
+  "tags": [],
   "securityStandards": {
     "CERT": [
       "MSC12-C."
@@ -16,5 +10,11 @@
       571,
       570
     ]
+  },
+  "defaultQualityProfiles": [],
+  "extra": {
+    "replacementRules": [
+      "RSPEC-6651"
+    ]
   }
 }
diff --git a/rules/S2589/java/metadata.json b/rules/S2589/java/metadata.json
index eee5a2f0f83..6110fb50560 100644
--- a/rules/S2589/java/metadata.json
+++ b/rules/S2589/java/metadata.json
@@ -1,8 +1,10 @@
 {
-  "tags": [
-    "cwe",
-    "suspicious",
-    "redundant", 
-    "symbolic-execution" 
-  ]
+  "status": "deprecated",
+  "tags": [],
+  "defaultQualityProfiles": [],
+  "extra": {
+    "replacementRules": [
+      "RSPEC-6646"
+    ]
+  }
 }
diff --git a/rules/S3518/java/metadata.json b/rules/S3518/java/metadata.json
index ad2fcf5b412..784c133affd 100644
--- a/rules/S3518/java/metadata.json
+++ b/rules/S3518/java/metadata.json
@@ -1,10 +1,6 @@
 {
-  "tags": [
-    "cwe",
-    "denial-of-service",
-    "cert",
-    "symbolic-execution"
-  ],
+  "status": "deprecated",
+  "tags": [],
   "securityStandards": {
     "CERT": [
       "NUM02-J.",
@@ -16,5 +12,11 @@
     "STIG ASD_V5R3": [
       "V-222612"
     ]
+  },
+  "defaultQualityProfiles": [],
+  "extra": {
+    "replacementRules": [
+      "RSPEC-6649"
+    ]
   }
 }
diff --git a/rules/S3655/java/metadata.json b/rules/S3655/java/metadata.json
index 30bfb33b844..d05102a0dad 100644
--- a/rules/S3655/java/metadata.json
+++ b/rules/S3655/java/metadata.json
@@ -1,7 +1,11 @@
 {
   "title": "Optional value should only be accessed after calling isPresent()",
-  "tags": [
-  	"cwe",
-    "symbolic-execution"
-  ]
+  "status": "deprecated",
+  "tags": [],
+  "defaultQualityProfiles": [],
+  "extra": {
+    "replacementRules": [
+      "RSPEC-6707"
+    ]
+  }
 }
diff --git a/rules/S3959/java/metadata.json b/rules/S3959/java/metadata.json
index 751abfda993..42be7474488 100644
--- a/rules/S3959/java/metadata.json
+++ b/rules/S3959/java/metadata.json
@@ -7,18 +7,15 @@
     },
     "attribute": "LOGICAL"
   },
-  "status": "ready",
+  "status": "deprecated",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "java8",
-    "symbolic-execution"
-  ],
+  "tags": [],
   "extra": {
     "replacementRules": [
-
+      "RSPEC-6976"
     ],
     "legacyKeys": [
 
@@ -28,8 +25,6 @@
   "ruleSpecification": "RSPEC-3959",
   "sqKey": "S3959",
   "scope": "All",
-  "defaultQualityProfiles": [
-    "Sonar way"
-  ],
+  "defaultQualityProfiles": [],
   "quickfix": "unknown"
 }