diff --git a/conf/default.yaml b/conf/default.yaml
index a00c00956..dc3ad4083 100644
--- a/conf/default.yaml
+++ b/conf/default.yaml
@@ -54,9 +54,9 @@ packages:
     # if package is not available locally, proxy requests to 'npmjs' registry
     proxy: npmjs
 
-# You can specify HTTP/1.1 server keep alive timeout in seconds for incomming connections.
+# You can specify HTTP/1.1 server keep alive timeout in seconds for incoming connections.
 # A value of 0 makes the http server behave similarly to Node.js versions prior to 8.0.0, which did not have a keep-alive timeout.
-# WORKAROUND: Through given configuration you can workaround following issue https://github.com/verdaccio/verdaccio/issues/301. Set to 0 in case 60 is not enought.
+# WORKAROUND: Through given configuration you can workaround following issue https://github.com/verdaccio/verdaccio/issues/301. Set to 0 in case 60 is not enough.
 server:
   keepAliveTimeout: 60
 
diff --git a/src/api/endpoint/api/publish.ts b/src/api/endpoint/api/publish.ts
index 0a5ee1a9b..9c2b4ed22 100644
--- a/src/api/endpoint/api/publish.ts
+++ b/src/api/endpoint/api/publish.ts
@@ -43,7 +43,7 @@ export default function publish(router: Router, auth: IAuth, storage: IStorageHa
    *  1. Try to fetch  metadata -> if it fails, return 404
    *  2. Compute metadata locally (client side) and send a mutate payload excluding the version to be unpublished
    *    eg: if metadata reflects 1.0.1, 1.0.2 and 1.0.3, the computed metadata won't include 1.0.3.
-   *  3. Once the second step has been succesfully finished, delete the tarball.
+   *  3. Once the second step has been successfully finished, delete the tarball.
    *
    *  All these steps are consecutive and required, there is no transacions here, if step 3 fails, metadata might
    *  get corrupted.
diff --git a/src/lib/logger.ts b/src/lib/logger.ts
index 15c40e72f..31a0fb778 100644
--- a/src/lib/logger.ts
+++ b/src/lib/logger.ts
@@ -13,7 +13,7 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 
 /**
- * A RotatingFileStream that modifes the message first
+ * A RotatingFileStream that modifies the message first
  */
 class VerdaccioRotatingFileStream extends Logger.RotatingFileStream {
   // We depend on mv so that this is there
diff --git a/test/functional/lib/setup.ts b/test/functional/lib/setup.ts
index ffd0f88a5..79ba46831 100644
--- a/test/functional/lib/setup.ts
+++ b/test/functional/lib/setup.ts
@@ -1,3 +1,3 @@
 module.exports = async function() {
-  // here we should create dinamically config files
+  // here we should create dynamically config files
 };
diff --git a/test/functional/lib/simple_server.ts b/test/functional/lib/simple_server.ts
index 2fc91d38b..82edb9566 100644
--- a/test/functional/lib/simple_server.ts
+++ b/test/functional/lib/simple_server.ts
@@ -4,7 +4,7 @@ import bodyParser from 'body-parser';
 /**
  * Simple Server
  *
- * A emtpy express server with the objetive to emumate any external API.
+ * A empty express server with the objective to emumate any external API.
  *
  * eg: test/functional/tags/tags.ts
  *
diff --git a/test/unit/modules/uplinks/up-storage.spec.ts b/test/unit/modules/uplinks/up-storage.spec.ts
index 5af4b122c..ae7b8d96b 100644
--- a/test/unit/modules/uplinks/up-storage.spec.ts
+++ b/test/unit/modules/uplinks/up-storage.spec.ts
@@ -220,7 +220,7 @@ describe('UpStorge', () => {
       });
 
       test('should fails on validate tarball path against uplink case#3', () => {
-        // same domain, diferent protocol, diferent port
+        // same domain, different protocol, different port
         const url = 'http://localhost:5001';
         const tarBallUrl = 'https://localhost:4000/api/npm/npm/pk1-juan/-/pk1-juan-1.0.7.tgz';
         const uplinkConf = { url };
diff --git a/test/unit/modules/utils/config-utils.spec.ts b/test/unit/modules/utils/config-utils.spec.ts
index 9a05205dd..7b7869b3d 100644
--- a/test/unit/modules/utils/config-utils.spec.ts
+++ b/test/unit/modules/utils/config-utils.spec.ts
@@ -137,7 +137,7 @@ describe('Config Utilities', () => {
       expect(react).toBeDefined();
       expect(react.access).toBeDefined();
 
-      // Intended checks, Typescript shoold catch this, we test the runtime part
+      // Intended checks, Typescript should catch this, we test the runtime part
       // @ts-ignore
       expect(react.access[0]).toBe(ROLES.$ALL);
       expect(react.publish).toBeDefined();
diff --git a/test/unit/partials/plugin/authenticate.success.js b/test/unit/partials/plugin/authenticate.success.js
index 5e0db9a79..e58235651 100644
--- a/test/unit/partials/plugin/authenticate.success.js
+++ b/test/unit/partials/plugin/authenticate.success.js
@@ -3,7 +3,7 @@ module.exports = function ( ) {
   return {
     authenticate( user, pass, callback ) {
       // https://verdaccio.org/docs/en/dev-plugins#onsuccess
-      // this is a succesfull login and return a simple group
+      // this is a successful login and return a simple group
       callback(null, ['test']);
     }
   };