diff --git a/scripts/data-validate.js b/scripts/data-validate.js
index fce9aa36..e9554ebb 100644
--- a/scripts/data-validate.js
+++ b/scripts/data-validate.js
@@ -82,5 +82,7 @@ async function isWorkingUrl(url) {
       `Action failed with ${failingUrls.length} URL fetch failures, see logs`
     );
   }
-  process.exit(0);
+  if (process.env.CI !== 'true') {
+    process.exit(failingUrls.length > 0 ? 1 : 0)
+  }
 })();
diff --git a/src/data.js b/src/data.js
index b0276624..3ca2d91d 100644
--- a/src/data.js
+++ b/src/data.js
@@ -116,7 +116,7 @@ const pages = [
     name: 'Sam Cross',
     description:
       '"Developer", IT student, frequent traveller by coach, addicted to music.',
-    url: 'https://sam-cross.github.io/uses',
+    url: 'http://sam-cross.github.io/uses',
     twitter: '@samcrxss',
     emoji: '🎵',
     country: '🇬🇧',
@@ -1803,26 +1803,6 @@ const pages = [
     phone: 'android',
     tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
   },
-  {
-    name: 'Oscar Sánchez',
-    description: 'Passionate developer, traveler and drummer from Perú',
-    url: 'https://devlusaja.com',
-    twitter: '@dev_lusaja',
-    emoji: '💻🛩💪',
-    country: '🇵🇪',
-    computer: 'linux',
-    phone: 'android',
-    tags: [
-      'Developer',
-      'Software Architect',
-      'Python',
-      'PHP',
-      'Docker',
-      'Graphql',
-      'AWS',
-      'Open Source',
-    ],
-  },
   {
     name: 'Thomas Maximini',
     description: 'Freelance software developer from Germany.',
@@ -1990,7 +1970,56 @@ export default pages;
 //   ],
 // },
 
-// No /uses page (404)
+// Times out
+// {
+//   name: 'Carlos Andres Charris Sandoval',
+//   description: 'Software Engineer',
+//   url: 'https://carloscharris.com/uses',
+//   twitter: '@Darkklitos',
+//   emoji: '🔥',
+//   country: '🇨🇴',
+//   computer: 'apple',
+//   phone: 'android',
+//   tags: [
+//     'Developer',
+//     'Full Stack',
+//     'JavaScript',
+//     'TypeScript',
+//     'Angular',
+//     'Vue',
+//     'React',
+//     'Node',
+//     'Java',
+//     'Docker',
+//     'Serverless',
+//   ],
+// },
+
+// Times out
+// {
+//   name: 'Carlos Junod',
+//   description:
+//     'Husband, Dreamer, Full Stack Developer, Javascript passionate, Graphic Designer',
+//   url: 'http://carlosjunod.me/uses/',
+//   twitter: '@carlosjunod',
+//   emoji: '🥑',
+//   country: '🇨🇱',
+//   computer: 'apple',
+//   phone: 'iphone',
+//   tags: [
+//     'Developer',
+//     'Full Stack',
+//     'React',
+//     'Designer',
+//     'Entrepreneur',
+//     'JavaScript',
+//     'Node',
+//     'CSS',
+//     'HTML',
+//   ],
+// },
+
+// No /uses page
 // {
 //   name: 'Hussain Aminu',
 //   description: 'Web Developer, Data Scientist',
@@ -2101,40 +2130,25 @@ export default pages;
 //   ],
 // },
 
-// Weird redirect to YouTube Video
+// No /uses page
 // {
-//   name: 'Juan Manuel Incaurgarat',
-//   description: 'Front end developer',
-//   url: 'https://kilinkis.me/uses',
-//   twitter: '@kilinkis',
-//   emoji: '🏀',
-//   country: '🇦🇷',
-//   computer: 'apple',
+//   name: 'Oscar Sánchez',
+//   description: 'Passionate developer, traveler and drummer from Perú',
+//   url: 'https://devlusaja.com',
+//   twitter: '@dev_lusaja',
+//   emoji: '💻🛩💪',
+//   country: '🇵🇪',
+//   computer: 'linux',
 //   phone: 'android',
-//   tags: ['React', 'WordPress', 'Gatsby', 'JavaScript', 'Node'],
-// },
-
-// DEAD site
-// {
-//   name: 'Carlos Junod',
-//   description:
-//     'Husband, Dreamer, Full Stack Developer, Javascript passionate, Graphic Designer',
-//   url: 'http://carlosjunod.me/uses/',
-//   twitter: '@carlosjunod',
-//   emoji: '🥑',
-//   country: '🇨🇱',
-//   computer: 'apple',
-//   phone: 'iphone',
 //   tags: [
 //     'Developer',
-//     'Full Stack',
-//     'React',
-//     'Designer',
-//     'Entrepreneur',
-//     'JavaScript',
-//     'Node',
-//     'CSS',
-//     'HTML',
+//     'Software Architect',
+//     'Python',
+//     'PHP',
+//     'Docker',
+//     'Graphql',
+//     'AWS',
+//     'Open Source',
 //   ],
 // },
 
@@ -2187,31 +2201,6 @@ export default pages;
 //   ],
 // },
 
-// Times out
-// {
-//   name: 'Carlos Andres Charris Sandoval',
-//   description: 'Software Engineer',
-//   url: 'https://carloscharris.com/uses',
-//   twitter: '@Darkklitos',
-//   emoji: '🔥',
-//   country: '🇨🇴',
-//   computer: 'apple',
-//   phone: 'android',
-//   tags: [
-//     'Developer',
-//     'Full Stack',
-//     'JavaScript',
-//     'TypeScript',
-//     'Angular',
-//     'Vue',
-//     'React',
-//     'Node',
-//     'Java',
-//     'Docker',
-//     'Serverless',
-//   ],
-// },
-
 // Empty /uses page
 // {
 //   name: 'Ændrew Rininsland',
@@ -2237,3 +2226,16 @@ export default pages;
 //     'D3',
 //   ],
 // },
+
+// Weird redirect to YouTube Video
+// {
+//   name: 'Juan Manuel Incaurgarat',
+//   description: 'Front end developer',
+//   url: 'https://kilinkis.me/uses',
+//   twitter: '@kilinkis',
+//   emoji: '🏀',
+//   country: '🇦🇷',
+//   computer: 'apple',
+//   phone: 'android',
+//   tags: ['React', 'WordPress', 'Gatsby', 'JavaScript', 'Node'],
+// },